cvs: php4 /main rfc1867.c
| From: | Stefan Esser | Date: | Sat, 17 Aug 2002 11:31:07 +0000 |
| Subject: | cvs: php4 /main rfc1867.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13429@lists.php.net to get a copy of this message | ||
sesser Sat Aug 17 07:31:07 2002 EDT
Modified files:
/php4/main rfc1867.c
Log:
fixed the user supplied patch for bug #18792
Index: php4/main/rfc1867.c
diff -u php4/main/rfc1867.c:1.114 php4/main/rfc1867.c:1.115
--- php4/main/rfc1867.c:1.114 Fri Aug 16 15:34:43 2002
+++ php4/main/rfc1867.c Sat Aug 17 07:31:06 2002
@@ -16,7 +16,7 @@
| Jani Taskinen <sniper@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.114 2002/08/16 19:34:43 kalowsky Exp $ */
+/* $Id: rfc1867.c,v 1.115 2002/08/17 11:31:06 sesser Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -639,10 +639,6 @@
return;
}
- /* search for the end of the boundary */
- boundary_end = strchr(boundary, ',');
- if (boundary_end ) *boundary_end = 0;
-
boundary++;
boundary_len = strlen(boundary);
@@ -654,6 +650,13 @@
boundary++;
boundary_len -= 2;
boundary[boundary_len] = '\0';
+ } else {
+ /* search for the end of the boundary */
+ boundary_end = strchr(boundary, ',');
+ if (boundary_end) {
+ boundary_end[0] = '\0';
+ boundary_len = boundary_end-boundary;
+ }
}
/* Initialize the buffer */