markt 2003/12/13 14:49:30
Modified: catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
Log:
- Fix for bug 5759. CGI servlet does not support extension mapping.
- This patch needs review.
Revision Changes Path
1.10 +13 -8
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
Index: CGIServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CGIServlet.java 12 Dec 2003 22:50:57 -0000 1.9
+++ CGIServlet.java 13 Dec 2003 22:49:30 -0000 1.10
@@ -794,8 +794,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]
