remm        2005/09/22 10:20:21

  Modified:    webapps/docs changelog.xml
               catalina/src/share/org/apache/catalina/connector
                        CoyoteAdapter.java
  Log:
  - 34749: jsessionid dropped on trailing slash (/) redirect.
  
  Revision  Changes    Path
  1.379     +3 -0      jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.378
  retrieving revision 1.379
  diff -u -r1.378 -r1.379
  --- changelog.xml     22 Sep 2005 14:21:18 -0000      1.378
  +++ changelog.xml     22 Sep 2005 17:20:21 -0000      1.379
  @@ -70,6 +70,9 @@
           <bug>35609</bug>: service.bat echo command when wrong arguments 
given [patch by Robert
           Longson] (yoavs)
         </fix>
  +      <fix>
  +        <bug>34749</bug>: jsessionid dropped on trailing slash (/) redirect 
(remm)
  +      </fix>
       </changelog>
     </subsection>
     
  
  
  
  1.10      +7 -1      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
  
  Index: CoyoteAdapter.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CoyoteAdapter.java        30 Apr 2005 03:32:43 -0000      1.9
  +++ CoyoteAdapter.java        22 Sep 2005 17:20:21 -0000      1.10
  @@ -305,6 +305,12 @@
           if (!redirectPathMB.isNull()) {
               String redirectPath = redirectPathMB.toString();
               String query = request.getQueryString();
  +            if (request.isRequestedSessionIdFromURL()) {
  +                // This is not optimal, but as this is not very common, it
  +                // shouldn't matter
  +                redirectPath = redirectPath + ";jsessionid=" 
  +                    + request.getRequestedSessionId();
  +            }
               if (query != null) {
                   // This is not optimal, but as this is not very common, it
                   // shouldn't matter
  
  
  

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

Reply via email to