Author: markt
Date: Tue Jul 7 13:56:37 2015
New Revision: 1689675
URL: http://svn.apache.org/r1689675
Log:
Clean-up
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1689675&r1=1689674&r2=1689675&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Tue Jul 7
13:56:37 2015
@@ -564,13 +564,10 @@ public final class CGIServlet extends Ht
*
* @exception ServletException if a servlet-specific exception occurs
* @exception IOException if a read/write exception occurs
- *
- * @see javax.servlet.http.HttpServlet
- *
*/
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse res)
- throws ServletException, IOException {
+ throws ServletException, IOException {
CGIEnvironment cgiEnv = new CGIEnvironment(req, getServletContext());
@@ -579,16 +576,14 @@ public final class CGIServlet extends Ht
cgiEnv.getEnvironment(),
cgiEnv.getWorkingDirectory(),
cgiEnv.getParameters());
- //if POST, we need to cgi.setInput
- //REMIND: how does this interact with Servlet API 2.3's Filters?!
+ // If POST, we need to cgi.setInput
+ // REMIND: how does this interact with Servlet API 2.3's Filters?!
if ("POST".equals(req.getMethod())) {
cgi.setInput(req.getInputStream());
}
cgi.setResponse(res);
cgi.run();
- }
-
- if (!cgiEnv.isValid()) {
+ } else {
res.setStatus(404);
}
@@ -625,11 +620,8 @@ public final class CGIServlet extends Ht
printServletEnvironment(out, req, res);
out.println("</BODY></HTML>");
-
}
-
-
- } //doGet
+ }
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
