Re: cvs: php4 /ext/standard quot_print.c /ext/standard/tests/general_functions 002.phpt 006.phpt

Hello Kirill, can you merge this to the 4.2 branch too? Derick On Mon, 1 Apr 2002, Kirill Maximov wrote: > kir Mon Apr 1 12:03:01 2002 EDT > > Added files: > /php4/ext/standard/tests/general_functions 006.phpt > > Modified files: > /php4/ext/standard quot_print.c > /php4/ext/standard/tests/general_functions 002.phpt > Log: > (PHP quoted_printable_decode) Fixed CR/LF processing for Windows/OS2 > @ Fixed CR/LF processing for Windows/OS2 in quoted_printable_decode (kir) > > > > Index: php4/ext/standard/quot_print.c > diff -u php4/ext/standard/quot_print.c:1.19 php4/ext/standard/quot_print.c:1.20 > --- php4/ext/standard/quot_print.c:1.19 Thu Feb 28 03:26:48 2002 > +++ php4/ext/standard/quot_print.c Mon Apr 1 12:03:01 2002 > @@ -16,7 +16,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: quot_print.c,v 1.19 2002/02/28 08:26:48 sebastian Exp $ */ > +/* $Id: quot_print.c,v 1.20 2002/04/01 17:03:01 kir Exp $ */ > > #include <stdlib.h> > > @@ -44,6 +44,10 @@ > { > return c - 'A' + 10; > } > + else if ( c >= 'a' && c <= 'f' ) > + { > + return c - 'a' + 10; > + } > else > { > return -1; > @@ -102,7 +106,7 @@ > /* End of line reached */ > i += k; > } > - else if ( (str_in[i+k] == 10) && (str_in[i+k+1] == 13)) > + else if ( (str_in[i+k] == 13) && (str_in[i+k+1] == 10)) > { > /* CRLF */ > i += k+2; > Index: php4/ext/standard/tests/general_functions/002.phpt > diff -u php4/ext/standard/tests/general_functions/002.phpt:1.1 > php4/ext/standard/tests/general_functions/002.phpt:1.2 > --- php4/ext/standard/tests/general_functions/002.phpt:1.1 Fri Nov 17 05:55:37 2000 > +++ php4/ext/standard/tests/general_functions/002.phpt Mon Apr 1 12:03:01 2002 > @@ -3,11 +3,11 @@ > --POST-- > --GET-- > --FILE-- > -<?php echo quoted_printable_decode("=FAwow-factor=C1=D0=D5=DD=C5=CE=CE=D9=C5=0A= > -=20=D4=CF=D2=C7=CF=D7=D9=C5= > +<?php echo quoted_printable_decode("=FAwow-factor=C1=d0=D5=DD=C5=CE=CE=D9=C5=0A= > +=20=D4=cf=D2=C7=CF=D7=D9=C5= > =20= > =D0= > =D2=CF=C5=CB=D4=D9"); ?> > --EXPECT-- > úwow-factorÁÐÕÝÅÎÎÙÅ > - ÔÏÒÇÏ×ÙÅ ÐÒÏÅËÔÙ > \ No newline at end of file > + ÔÏÒÇÏ×ÙÅ ÐÒÏÅËÔÙ > > Index: php4/ext/standard/tests/general_functions/006.phpt > +++ php4/ext/standard/tests/general_functions/006.phpt > --TEST-- > quoted_printable_decode() function test with CR/LF > --POST-- > --GET-- > --FILE-- > <?php echo quoted_printable_decode("=FAwow-factor=C1=D0=D5=DD=C5=CE=CE=D9=C5=0A= > =20=D4=CF=D2=C7=CF=D7=D9=C5= > =20= > =D0= > =D2=CF=C5=CB=D4=D9"); ?> > --EXPECT-- > úwow-factorÁÐÕÝÅÎÎÙÅ > ÔÏÒÇÏ×ÙÅ ÐÒÏÅËÔÙ > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > ----------------------------------------------------------------------- PHP: Scripting the Web - derick@php.net All your branches are belong to me! SRM: Script Running Machine - www.vl-srm.net -----------------------------------------------------------------------