Re: cvs: php4(PHP_4_0_7) /main rfc1867.c

Yes On Thu, 28 Feb 2002, Andi Gutmans wrote: > Does this mean 4.1.2 is broken? > > Andi > > At 03:51 AM 2/28/2002 +0000, Rasmus Lerdorf wrote: > >rasmus Wed Feb 27 22:51:48 2002 EDT > > > > Modified files: (Branch: PHP_4_0_7) > > /php4/main rfc1867.c > > Log: > > That code made no sense - fix it to do what was originally intended > > > > > >Index: php4/main/rfc1867.c > >diff -u php4/main/rfc1867.c:1.71.2.2 php4/main/rfc1867.c:1.71.2.3 > >--- php4/main/rfc1867.c:1.71.2.2 Thu Feb 21 13:46:45 2002 > >+++ php4/main/rfc1867.c Wed Feb 27 22:51:48 2002 > >@@ -15,7 +15,7 @@ > > | Authors: Rasmus Lerdorf <rasmus@php.net> | > > +----------------------------------------------------------------------+ > > */ > >-/* $Id: rfc1867.c,v 1.71.2.2 2002/02/21 18:46:45 sesser Exp $ */ > >+/* $Id: rfc1867.c,v 1.71.2.3 2002/02/28 03:51:48 rasmus Exp $ */ > > > > #include <stdio.h> > > #include "php.h" > >@@ -162,20 +162,21 @@ > > SAFE_RETURN; > > } > > /* some other headerfield found, > > skip it */ > >- loc = (char *) memchr(ptr, '\n', > >rem)+1; > >+ loc = (char *) memchr(ptr, '\n', rem); > > if (!loc) { > > /* broken */ > > 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; > >- } > >+ } else loc++; > >+ > > while (*loc == ' ' || *loc == > > '\t') { > > /* other field is folded, > > skip it */ > >- loc = (char *) memchr(loc, > >'\n', rem-(loc-ptr))+1; > >+ loc = (char *) memchr(loc, > >'\n', rem-(loc-ptr)); > > if (!loc) { > > /* broken */ > > > >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; > >- } > >+ } else loc++; > > } > > rem -= (loc - ptr); > > ptr = loc; > > > > > > > >-- > >PHP CVS Mailing List (http://www.php.net/) > >To unsubscribe, visit: http://www.php.net/unsub.php >