yoavs 2004/11/19 06:51:17
Modified: catalina/src/share/org/apache/catalina/servlets Tag:
TOMCAT_5_0 CGIServlet.java
webapps/docs Tag: TOMCAT_5_0 changelog.xml
Log:
Bugzilla 32023: CGIServlet fails to handle post message with multipart/form
data
Revision Changes Path
No revision
No revision
1.22.2.2 +13 -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.22.2.1
retrieving revision 1.22.2.2
diff -u -r1.22.2.1 -r1.22.2.2
--- CGIServlet.java 28 Sep 2004 22:19:32 -0000 1.22.2.1
+++ CGIServlet.java 19 Nov 2004 14:51:17 -0000 1.22.2.2
@@ -1630,7 +1630,14 @@
ByteArrayOutputStream contentStream = null;
if(!"".equals(sContentLength)) {
byte[] content = new byte[Integer.parseInt(sContentLength)];
- int lenRead = stdin.read(content);
+
+ // Bugzilla 32023
+ int lenRead = 0;
+ do {
+ int partRead =
stdin.read(content,lenRead,content.length-lenRead);
+ lenRead += partRead;
+ } while (lenRead > 0 && lenRead < content.length);
+
contentStream = new ByteArrayOutputStream(
Integer.parseInt(sContentLength));
if ("POST".equals(env.get("REQUEST_METHOD"))) {
No revision
No revision
1.70.2.77 +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.70.2.76
retrieving revision 1.70.2.77
diff -u -r1.70.2.76 -r1.70.2.77
--- changelog.xml 19 Nov 2004 14:37:47 -0000 1.70.2.76
+++ changelog.xml 19 Nov 2004 14:51:17 -0000 1.70.2.77
@@ -70,6 +70,9 @@
<fix>
<bug>32082</bug>: Add protected getPrincipals method to MemoryRealm
for easier extension. (yoavs)
</fix>
+ <fix>
+ <bug>32023</bug>: CGIServlet fails to handle post message with
multipart/form data. (yoavs)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
