Author: markt
Date: Mon Aug 15 19:54:44 2016
New Revision: 1756419
URL: http://svn.apache.org/viewvc?rev=1756419&view=rev
Log:
Align 8.0.x with 8.5.x
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1756419&r1=1756418&r2=1756419&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Mon
Aug 15 19:54:44 2016
@@ -175,8 +175,8 @@ import org.apache.tomcat.util.res.String
* and stderr (which should not be too hard).
* <br>
* If you find your cgi scripts are timing out receiving input, you can set
- * the init parameter <code></code> of your webapps' cgi-handling servlet
- * to be
+ * the init parameter <code>stderrTimeout</code> of your webapps' cgi-handling
+ * servlet.
* </p>
* <p>
*
@@ -213,7 +213,6 @@ import org.apache.tomcat.util.res.String
* <a href="http://cgi-spec.golux.com";>http://cgi-spec.golux.com</a>.
*
* </p>
- * <p>
* <h3>TODO:</h3>
* <ul>
* <li> Support for setting headers (for example, Location headers don't work)
@@ -233,7 +232,6 @@ import org.apache.tomcat.util.res.String
*
* @author Martin T Dengler [[email protected]]
* @author Amy Roh
- * @since Tomcat 4.0
*/
public final class CGIServlet extends HttpServlet {
@@ -542,7 +540,7 @@ public final class CGIServlet extends Ht
}
- /*
+ /**
* Behaviour depends on the status code.
*
* Status < 400 - Calls setStatus. Returns false. CGI servlet will provide
@@ -564,11 +562,6 @@ public final class CGIServlet extends Ht
/**
* Encapsulates the CGI environment and rules to derive
* that environment from the servlet container and request information.
- *
- * <p>
- * </p>
- *
- * @since Tomcat 4.0
*/
protected class CGIEnvironment {
@@ -615,7 +608,7 @@ public final class CGIServlet extends Ht
* the Servlet API
* @param context ServletContext for information provided by the
* Servlet API
- *
+ * @throws IOException an IO error occurred
*/
protected CGIEnvironment(HttpServletRequest req,
ServletContext context) throws IOException {
@@ -651,7 +644,7 @@ public final class CGIServlet extends Ht
*
* @param req HttpServletRequest for information provided by
* the Servlet API
- * @throws UnsupportedEncodingException
+ * @throws UnsupportedEncodingException Unknown encoding
*/
protected void setupFromRequest(HttpServletRequest req)
throws UnsupportedEncodingException {
@@ -768,8 +761,6 @@ public final class CGIServlet extends Ht
* <code>name</code> - simple name (no directories) of the
* cgi script, or null if no cgi was found
* </ul>
- *
- * @since Tomcat 4.0
*/
protected String[] findCGI(String pathInfo, String webAppRootDir,
String contextPath, String servletPath,
@@ -840,6 +831,7 @@ public final class CGIServlet extends Ht
*
* @return true if environment was set OK, false if there
* was a problem and no environment was set
+ * @throws IOException an IO error occurred
*/
protected boolean setCGIEnvironment(HttpServletRequest req) throws
IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
