cvs: /php4 rfc1867.c
| From: | Thies C. Arntzen | Date: | Sat, 12 Feb 2000 17:37:41 +0000 |
| Subject: | cvs: /php4 rfc1867.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-10185@lists.php.net to get a copy of this message | ||
thies Sat Feb 12 09:37:41 2000 EDT
Modified files:
/php4 rfc1867.c
Log:
@- Workaround for bogus POST-Data from IE/Mac. (Thies)
@ Patch by Alain Malek <alain@virtua.ch>
fix #2944
Index: php4/rfc1867.c
diff -u php4/rfc1867.c:1.24 php4/rfc1867.c:1.25
--- php4/rfc1867.c:1.24 Sat Jan 29 03:55:43 2000
+++ php4/rfc1867.c Sat Feb 12 09:37:11 2000
@@ -15,7 +15,7 @@
| Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.24 2000/01/29 11:55:43 zeev Exp $ */
+/* $Id: rfc1867.c,v 1.25 2000/02/12 17:37:11 thies Exp $ */
#include <stdio.h>
#include "php.h"
@@ -37,6 +37,7 @@
{
char *ptr, *loc, *loc2, *s, *name, *filename, *u, *fn;
int len, state = 0, Done = 0, rem, urem;
+ int eolsize;
long bytes, max_file_size = 0;
char *namebuf=NULL, *filenamebuf=NULL, *lbuf=NULL;
FILE *fp;
@@ -64,8 +65,13 @@
if (!strncmp(loc, boundary, len)) {
state = 1;
- rem -= (loc - ptr) + len + 2;
- ptr = loc + len + 2;
+
+ eolsize = 2;
+ if(*(loc+len)==0x0a)
+ eolsize = 1;
+
+ rem -= (loc - ptr) + len + eolsize;
+ ptr = loc + len + eolsize;
} else {
rem -= (loc - ptr) + 1;
ptr = loc + 1;