You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2001/08/20 04:42:11 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets CGIServlet.java
amyroh 01/08/19 19:42:11
Modified: catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
Log:
Sets 404 not found when cgi script doesn't exist -- submitted by Pier P. Fumagalli.
Revision Changes Path
1.6 +8 -7 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CGIServlet.java 2001/08/20 00:33:34 1.5
+++ CGIServlet.java 2001/08/20 02:42:11 1.6
@@ -1,6 +1,6 @@
/*
- * CGIServlet.java $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v 1.5 2001/08/20 00:33:34 craigmcc Exp $
- * $Revision: 1.5 $, $Date: 2001/08/20 00:33:34 $
+ * CGIServlet.java $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v 1.6 2001/08/20 02:42:11 amyroh Exp $
+ * $Revision: 1.6 $, $Date: 2001/08/20 02:42:11 $
*
* ====================================================================
*
@@ -283,7 +283,7 @@
*
* @author Martin T Dengler [root@martindengler.com]
* @author Amy Roh
- * @version $Revision: 1.5 $, $Date: 2001/08/20 00:33:34 $
+ * @version $Revision: 1.6 $, $Date: 2001/08/20 02:42:11 $
* @since Tomcat 4.0
*
*/
@@ -642,11 +642,12 @@
try {
ServletOutputStream out = res.getOutputStream();
out.println("<HTML><HEAD><TITLE>$Name: $</TITLE></HEAD>");
- out.println("<BODY>$Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v 1.5 2001/08/20 00:33:34 craigmcc Exp $<p>");
+ out.println("<BODY>$Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v 1.6 2001/08/20 02:42:11 amyroh Exp $<p>");
if (cgiEnv.isValid()) {
out.println(cgiEnv.toString());
} else {
+ res.setStatus(404);
out.println("<H3>");
out.println("CGI script not found or not specified.");
out.println("</H3>");
@@ -684,7 +685,7 @@
/** For future testing use only; does nothing right now */
public static void main(String[] args) {
- System.out.println("$Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v 1.5 2001/08/20 00:33:34 craigmcc Exp $");
+ System.out.println("$Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v 1.6 2001/08/20 02:42:11 amyroh Exp $");
}
@@ -700,7 +701,7 @@
* </p>
*
* @author Martin Dengler [root@martindengler.com]
- * @version $Revision: 1.5 $, $Date: 2001/08/20 00:33:34 $
+ * @version $Revision: 1.6 $, $Date: 2001/08/20 02:42:11 $
* @since Tomcat 4.0
*
*/
@@ -1322,7 +1323,7 @@
* </p>
*
* @author Martin Dengler [root@martindengler.com]
- * @version $Revision: 1.5 $, $Date: 2001/08/20 00:33:34 $
+ * @version $Revision: 1.6 $, $Date: 2001/08/20 02:42:11 $
*/
protected class CGIRunner {