markt 2004/11/29 13:47:35
Modified: catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
webapps/docs changelog.xml
Log:
Fix bug 32429. stderr line count was always 1.
- Patch provided by Mark Claassen
- Ported from TC4
Revision Changes Path
1.29 +6 -6
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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- CGIServlet.java 19 Nov 2004 14:44:42 -0000 1.28
+++ CGIServlet.java 29 Nov 2004 21:47:34 -0000 1.29
@@ -1862,8 +1862,8 @@
try {
while ((line = rdr.readLine()) != null) {
log("runCGI (stderr):" + line) ;
+ lineCount++ ;
}
- lineCount++ ;
} catch (IOException e) {
log("sendToLog error", e) ;
} finally {
1.186 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- changelog.xml 27 Nov 2004 21:11:07 -0000 1.185
+++ changelog.xml 29 Nov 2004 21:47:34 -0000 1.186
@@ -79,6 +79,9 @@
<update>
Add DIGEST authentication support to the JDBC and DataSource realms.
Supports both digested and cleartext passwords. (markt)
</update>
+ <fix>
+ <bug>32429</bug>: CGIServlet calculates number of lines received on
stderr incorrectly. (markt)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
