cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java

[patrickl]

patrickl    01/11/16 14:53:01

  Modified:    catalina/src/share/org/apache/catalina/servlets
                        DefaultServlet.java
  Log:
  Use the request's URI in error pages instead of just the path with the current 
context. This behavior was in Tomcat 4.0.1 but was lost recently. This change only 
restores the old error messages.
  
  Revision  Changes    Path
  1.44      +8 -8      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
  
  Index: DefaultServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- DefaultServlet.java       2001/11/16 09:46:53     1.43
  +++ DefaultServlet.java       2001/11/16 22:53:01     1.44
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
 1.43 2001/11/16 09:46:53 remm Exp $
  - * $Revision: 1.43 $
  - * $Date: 2001/11/16 09:46:53 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
 1.44 2001/11/16 22:53:01 patrickl Exp $
  + * $Revision: 1.44 $
  + * $Date: 2001/11/16 22:53:01 $
    *
    * ====================================================================
    *
  @@ -123,7 +123,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.43 $ $Date: 2001/11/16 09:46:53 $
  + * @version $Revision: 1.44 $ $Date: 2001/11/16 22:53:01 $
    */
   
   public class DefaultServlet
  @@ -1045,7 +1045,7 @@
           if ((path == null) ||
               path.toUpperCase().startsWith("/WEB-INF") ||
               path.toUpperCase().startsWith("/META-INF")) {
  -            response.sendError(HttpServletResponse.SC_NOT_FOUND, path);
  +            response.sendError(HttpServletResponse.SC_NOT_FOUND, 
request.getRequestURI());
               return;
           }
   
  @@ -1054,7 +1054,7 @@
           ResourceInfo resourceInfo = new ResourceInfo(path, resources);
   
           if (!resourceInfo.exists) {
  -            response.sendError(HttpServletResponse.SC_NOT_FOUND, path);
  +            response.sendError(HttpServletResponse.SC_NOT_FOUND, 
request.getRequestURI());
               return;
           }
   
  @@ -1062,7 +1062,7 @@
           // ends with "/" or "\", return NOT FOUND
           if (!resourceInfo.collection) {
               if (path.endsWith("/") || (path.endsWith("\\"))) {
  -                response.sendError(HttpServletResponse.SC_NOT_FOUND, path);
  +                response.sendError(HttpServletResponse.SC_NOT_FOUND, 
request.getRequestURI());
                   return;
               }
           }
  @@ -1111,7 +1111,7 @@
               // suppress them
               if (!listings) {
                   response.sendError(HttpServletResponse.SC_NOT_FOUND,
  -                                   resourceInfo.path);
  +                                   request.getRequestURI());
                   return;
               }
               contentType = "text/html;charset=UTF-8";
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>