cvs: php4 /main rfc1867.c
| From: | Zeev Suraski | Date: | Mon, 16 Jul 2001 20:42:49 +0000 |
| Subject: | cvs: php4 /main rfc1867.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6245@lists.php.net to get a copy of this message | ||
zeev Mon Jul 16 16:42:49 2001 EDT
Modified files:
/php4/main rfc1867.c
Log:
Fix layout
Guys - when submitting patches - please make sure you're not breaking
the layout of the code! It's not less important than the patch
itself.
Index: php4/main/rfc1867.c
diff -u php4/main/rfc1867.c:1.65 php4/main/rfc1867.c:1.66
--- php4/main/rfc1867.c:1.65 Tue Jun 19 12:54:30 2001
+++ php4/main/rfc1867.c Mon Jul 16 16:42:49 2001
@@ -15,7 +15,7 @@
| Authors: Rasmus Lerdorf <rasmus@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.65 2001/06/19 16:54:30 sniper Exp $ */
+/* $Id: rfc1867.c,v 1.66 2001/07/16 20:42:49 zeev Exp $ */
#include <stdio.h>
#include "php.h"
@@ -158,12 +158,12 @@
SAFE_RETURN;
}
if (ptr[1] == '\n') {
- /* empty line as end of header found */
+ /* empty line as end of header found */
php_error(E_WARNING, "File Upload Mime headers garbled ptr: [%c%c%c%c%c]", *ptr,
*(ptr + 1), *(ptr + 2), *(ptr + 3), *(ptr + 4));
SAFE_RETURN;
- }
+ }
/* some other headerfield found, skip it */
- loc = (char *) memchr(ptr, '\n', rem)+1;
+ loc = (char *) memchr(ptr, '\n', rem)+1;
while (*loc == ' ' || *loc == '\t')
/* other field is folded, skip it */
loc = (char *) memchr(loc, '\n',
rem-(loc-ptr))+1;
@@ -171,9 +171,10 @@
ptr = loc;
}
loc = memchr(ptr, '\n', rem);
- while (loc[1] == ' ' || loc[1] == '\t')
+ while (loc[1] == ' ' || loc[1] == '\t') {
/* field is folded, look for end */
loc = memchr(loc+1, '\n', rem-(loc-ptr)-1);
+ }
name = strstr(ptr, " name=");
if (name && name < loc) {
name += 6;