cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/request StaticInterceptor.java

[marcsaeg]

marcsaeg    01/05/30 14:33:04

  Modified:    src/share/org/apache/tomcat/request Tag: tomcat_32
                        StaticInterceptor.java
  Log:
  The previous commit by arieh removed larryi's previous fix for using
  javax.servlet.include.servlet_path.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.10  +4 -1      
jakarta-tomcat/src/share/org/apache/tomcat/request/Attic/StaticInterceptor.java
  
  Index: StaticInterceptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/request/Attic/StaticInterceptor.java,v
  retrieving revision 1.7.2.9
  retrieving revision 1.7.2.10
  diff -u -r1.7.2.9 -r1.7.2.10
  --- StaticInterceptor.java    2001/03/16 23:41:57     1.7.2.9
  +++ StaticInterceptor.java    2001/05/30 21:33:02     1.7.2.10
  @@ -377,7 +377,10 @@
            subReq=req.getChild();
   
        Context ctx=subReq.getContext();
  -     String pathInfo=subReq.getServletPath();
  +    // If this file is being included, use javax.servlet.include.servlet_path.
  +    String pathInfo = 
(String)subReq.getAttribute("javax.servlet.include.servlet_path");
  +    if(pathInfo == null)
  +        pathInfo=subReq.getServletPath();
        String absPath = (String)subReq.getNote( realFileNote );
        if( absPath==null ) 
            absPath=ctx.getRealPath( pathInfo );