markt 2003/12/17 14:06:34
Modified: catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
Log:
- Port fix
- Bug 5759. CGI servlet does not support extension mapping.
Revision Changes Path
1.15 +13 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
Index: CGIServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CGIServlet.java 12 Dec 2003 22:52:20 -0000 1.14
+++ CGIServlet.java 17 Dec 2003 22:06:34 -0000 1.15
@@ -804,8 +804,13 @@
*/
protected void setupFromRequest(HttpServletRequest req) {
this.contextPath = req.getContextPath();
- this.pathInfo = req.getPathInfo();
this.servletPath = req.getServletPath();
+ this.pathInfo = req.getPathInfo();
+ // If getPathInfo() returns null, must be using extension mapping
+ // In this case, pathInfo should be same as servletPath
+ if (this.pathInfo == null) {
+ this.pathInfo = this.servletPath;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
