cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteResponse.java

[remm]

remm        02/03/15 22:09:13

  Modified:    coyote/src/java/org/apache/coyote/tomcat4
                        CoyoteResponse.java
  Log:
  - Fix two Watchdog failures.
  
  Revision  Changes    Path
  1.10      +8 -6      
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java
  
  Index: CoyoteResponse.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CoyoteResponse.java       16 Mar 2002 05:33:53 -0000      1.9
  +++ CoyoteResponse.java       16 Mar 2002 06:09:13 -0000      1.10
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
 1.9 2002/03/16 05:33:53 remm Exp $
  - * $Revision: 1.9 $
  - * $Date: 2002/03/16 05:33:53 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
 1.10 2002/03/16 06:09:13 remm Exp $
  + * $Revision: 1.10 $
  + * $Date: 2002/03/16 06:09:13 $
    *
    * ====================================================================
    *
  @@ -116,7 +116,7 @@
    *
    * @author Remy Maucherat
    * @author Craig R. McClanahan
  - * @version $Revision: 1.9 $ $Date: 2002/03/16 05:33:53 $
  + * @version $Revision: 1.10 $ $Date: 2002/03/16 06:09:13 $
    */
   
   public class CoyoteResponse
  @@ -1290,8 +1290,6 @@
               String scheme = request.getScheme();
               String name = request.getServerName();
               int port = request.getServerPort();
  -            String encodedURI = 
  -                urlEncoder.encodeURL(request.getDecodedRequestURI());
   
               try {
                   redirectURLCC.append(scheme, 0, scheme.length());
  @@ -1304,6 +1302,10 @@
                       redirectURLCC.append(portS, 0, portS.length());
                   }
                   if (!leadingSlash) {
  +                    String relativePath = request.getDecodedRequestURI();
  +                    int pos = relativePath.lastIndexOf('/');
  +                    relativePath = relativePath.substring(0, pos);
  +                    String encodedURI = urlEncoder.encodeURL(relativePath);
                       redirectURLCC.append(encodedURI, 0, encodedURI.length());
                       redirectURLCC.append('/');
                   }
  
  
  

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