[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Feb 16 01:33:01 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3319r2=1.3320diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3319 php-src/ChangeLog:1.3320 --- php-src/ChangeLog:1.3319Sun Feb 15 01:32:51 2009 +++ php-src/ChangeLog Mon Feb 16 01:32:59 2009 @@ -1,3 +1,189 @@ +2009-02-15 Felipe Pena felipe...@gmail.com + +* (PHP_5_3) + NEWS + ext/pdo_firebird/firebird_driver.c + ext/pdo_firebird/firebird_driver.c: + - Fixed bug #47398 (PDO_Firebird doesn't implements quoter correctly) + +2009-02-15 Greg Beaver g...@chiaraquartet.net + +* ext/phar/tests/cache_list/copyonwrite6.phar.phpt + ext/phar/tests/cache_list/files/write6.phar + ext/phar/tests/cache_list/files/write6.phar.inc: + MFB: fix test + +2009-02-15 Antony Dovgal t...@daylessday.org + +* ext/standard/tests/general_functions/phpinfo.phpt: + fix test + +* (PHP_5_3) + ext/standard/tests/general_functions/phpinfo.phpt: + fix tests + +2009-02-15 Greg Beaver g...@chiaraquartet.net + +* (PHP_5_3) + ext/phar/tests/cache_list/copyonwrite6.phar.phpt + ext/phar/tests/cache_list/files/write6.phar + ext/phar/tests/cache_list/files/write6.phar.inc: + fix the last remaining failing test (explicitly pass in SKIP_DOTS to + directory iterator) + +* ext/phar/phar.c + ext/phar/zip.c: + MFB: fix all remaining big-endian issues + +* (PHP_5_3) + ext/phar/phar.c + ext/phar/zip.c: + fix remaining big-endian issues with phar + +* ext/phar/zip.c: + MFB: fix getting/setting of all 16/32 bit on zip + +* (PHP_5_3) + ext/phar/zip.c: + fix getting/setting of all 16/32 values in zip + +* (PHP_5_3) + ext/phar/config.m4: + revert accidental commit of config.m4, big-endian isn't ready quite yet + +* ext/phar/tar.c: + MFB: fix setting of 32-bit values on big-endian systems + +* (PHP_5_3) + ext/phar/config.m4 + ext/phar/tar.c: + fix setting of 32-bit value on big-endian systems + +2009-02-15 Felipe Pena felipe...@gmail.com + +* (PHP_5_2) + ext/xmlrpc/tests/bug40576.phpt + ext/xmlrpc/tests/bug45556.phpt: + - Fix tests + +* ext/imap/tests/skipif.inc + ext/imap/tests/skipif.inc + ext/imap/tests/skipif.inc: + - Supressing error message for SKIPIF check works as expected + +2009-02-15 Ilia Alshanetsky i...@prohost.org + +* (PHP_5_2) + NEWS: + + reverted fix + +* (PHP_5_2) + ZendEngine2/zend_execute.c + ZendEngine2/zend_operators.c + ZendEngine2/zend_operators.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h: + + Revert patch for bug #46701 as it introduces a BC break + +2009-02-15 Moriyoshi Koizumi m...@mozo.jp + +* (PHP_5_2) + ext/mbstring/tests/mb_stristr_variation2.phpt + ext/mbstring/tests/mb_strstr_variation2.phpt + ext/mbstring/tests/mb_substr_count_variation2.phpt: + - MFH: these should have been in the previous commit. + +* (PHP_5_3) + ext/mbstring/tests/mb_stripos_variation2.phpt + ext/mbstring/tests/mb_stristr_variation2.phpt + ext/mbstring/tests/mb_strstr_variation2.phpt + ext/mbstring/tests/mb_substr_count_variation2.phpt: + - These should have been in the previous commit. + +* (PHP_5_2) + NEWS: + - BFN + +* (PHP_5_2) + ext/mbstring/mbstring.c + ext/mbstring/libmbfl/mbfl/mbfilter.c + ext/mbstring/tests/bug43840.phpt + ext/mbstring/tests/bug43840.phpt + ext/mbstring/tests/bug43841.phpt + ext/mbstring/tests/bug43841.phpt + ext/mbstring/tests/mb_stripos_variation3.phpt + ext/mbstring/tests/mb_stripos_variation3.phpt + ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt + ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt + ext/mbstring/tests/mb_strpos_variation2.phpt + ext/mbstring/tests/mb_strpos_variation2.phpt + ext/mbstring/tests/mb_strpos_variation3.phpt + ext/mbstring/tests/mb_strpos_variation3.phpt + ext/mbstring/tests/mb_strpos_variation5.phpt + ext/mbstring/tests/mb_strpos_variation5.phpt + ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt + ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt + ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt + ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt + ext/mbstring/tests/mb_strrpos_variation3.phpt + ext/mbstring/tests/mb_strrpos_variation3.phpt + ext/standard/tests/strings/bug40754.phpt + ext/standard/tests/strings/bug40754.phpt + ext/standard/tests/strings/strripos_offset.phpt + ext/standard/tests/strings/strripos_offset.phpt + ext/standard/tests/strings/strrpos_offset.phpt + ext/standard/tests/strings/strrpos_variation14.phpt
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Feb 16 01:33:04 2009 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1445r2=1.1446diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1445 ZendEngine2/ChangeLog:1.1446 --- ZendEngine2/ChangeLog:1.1445Sun Feb 15 01:32:57 2009 +++ ZendEngine2/ChangeLog Mon Feb 16 01:33:04 2009 @@ -1,3 +1,14 @@ +2009-02-15 Ilia Alshanetsky i...@prohost.org + +* (PHP_5_2) + zend_execute.c + zend_operators.c + zend_operators.h + zend_vm_def.h + zend_vm_execute.h: + + Revert patch for bug #46701 as it introduces a BC break + 2009-02-14 Rasmus Lerdorf ras...@lerdorf.com * acinclude.m4 @@ -27828,7 +27839,7 @@ 2003-06-10 Jani Taskinen sni...@iki.fi * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1445 2009/02/15 01:32:57 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1446 2009/02/16 01:33:04 changelog Exp $ tag 2003-06-10 James Cox ja...@imajes.info @@ -29552,7 +29563,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1445 2009/02/15 01:32:57 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1446 2009/02/16 01:33:04 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky i...@prohost.org
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
iliaa Sun Feb 15 14:31:55 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: reverted fix http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1419r2=1.2027.2.547.2.1420diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1419 php-src/NEWS:1.2027.2.547.2.1420 --- php-src/NEWS:1.2027.2.547.2.1419Sun Feb 15 07:12:15 2009 +++ php-src/NEWSSun Feb 15 14:31:55 2009 @@ -75,8 +75,6 @@ - Fixed bug #46748 (Segfault when an SSL error has more than one error). (Scott) - Fixed bug #46739 (array returned by curl_getinfo should contain content_type key). (Mikko) -- Fixed bug #46701 (Creating associative array with long values in the key fails - on 32bit linux). (Shire) - Fixed bug #46699 (xml_parse crash when parser is namespace aware). (Rob) - Fixed bug #46419 (Elements of associative arrays with NULL value are lost). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
helly Sun Feb 15 14:34:17 2009 UTC Modified files: /CVSROOTavail Log: - Give Brian access to the engine (to do my work - oops thx) and to prevent further delay in fixing, and he's pretty deeply into the engine anyways. http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1493r2=1.1494diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1493 CVSROOT/avail:1.1494 --- CVSROOT/avail:1.1493Thu Jan 29 20:38:17 2009 +++ CVSROOT/avail Sun Feb 15 14:34:16 2009 @@ -36,7 +36,7 @@ avail|loudi,cweiske|phd,docweb # People who work on the Engine - not people with just tests access -avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp|Zend,ZendEngine2,TSRM +avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire|Zend,ZendEngine2,TSRM # The PHP Documentation Group maintains the documentation and its # translations. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap/tests skipif.inc
felipe Sun Feb 15 16:00:48 2009 UTC
Modified files:
/php-src/ext/imap/tests skipif.inc
Log:
- Supressing error message for SKIPIF check works as expected
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/skipif.inc?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/imap/tests/skipif.inc
diff -u php-src/ext/imap/tests/skipif.inc:1.2
php-src/ext/imap/tests/skipif.inc:1.3
--- php-src/ext/imap/tests/skipif.inc:1.2 Fri Dec 5 10:59:08 2008
+++ php-src/ext/imap/tests/skipif.inc Sun Feb 15 16:00:48 2009
@@ -8,7 +8,7 @@
$options = OP_HALFOPEN; // this should be enough to verify server present
$retries = 0; // dont retry connect on failure
-$mbox = imap_open($mailbox, $username, $password, $options, $retries);
+$mbox = @imap_open($mailbox, $username, $password, $options, $retries);
if (!$mbox) {
die(skip could not connect to mailbox $mailbox);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/imap/tests skipif.inc
felipe Sun Feb 15 16:03:39 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/imap/tests skipif.inc
Log:
- Supressing error message for SKIPIF check works as expected
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/skipif.inc?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/imap/tests/skipif.inc
diff -u php-src/ext/imap/tests/skipif.inc:1.1.2.3
php-src/ext/imap/tests/skipif.inc:1.1.2.4
--- php-src/ext/imap/tests/skipif.inc:1.1.2.3 Fri Dec 5 11:02:04 2008
+++ php-src/ext/imap/tests/skipif.inc Sun Feb 15 16:03:39 2009
@@ -8,7 +8,7 @@
$options = OP_HALFOPEN; // this should be enough to verify server present
$retries = 0; // dont retry connect on failure
-$mbox = imap_open($mailbox, $username, $password, $options, $retries);
+$mbox = @imap_open($mailbox, $username, $password, $options, $retries);
if (!$mbox) {
die(skip could not connect to mailbox $mailbox);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap/tests skipif.inc
felipe Sun Feb 15 16:03:49 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/imap/tests skipif.inc
Log:
- Supressing error message for SKIPIF check works as expected
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/tests/skipif.inc?r1=1.1.4.3r2=1.1.4.4diff_format=u
Index: php-src/ext/imap/tests/skipif.inc
diff -u php-src/ext/imap/tests/skipif.inc:1.1.4.3
php-src/ext/imap/tests/skipif.inc:1.1.4.4
--- php-src/ext/imap/tests/skipif.inc:1.1.4.3 Fri Dec 5 11:02:55 2008
+++ php-src/ext/imap/tests/skipif.inc Sun Feb 15 16:03:49 2009
@@ -8,7 +8,7 @@
$options = OP_HALFOPEN; // this should be enough to verify server present
$retries = 0; // dont retry connect on failure
-$mbox = imap_open($mailbox, $username, $password, $options, $retries);
+$mbox = @imap_open($mailbox, $username, $password, $options, $retries);
if (!$mbox) {
die(skip could not connect to mailbox $mailbox);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlrpc/tests bug40576.phpt bug45556.phpt
felipe Sun Feb 15 16:50:34 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/xmlrpc/tests bug40576.phpt bug45556.phpt Log: - Fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug40576.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/ext/xmlrpc/tests/bug40576.phpt diff -u php-src/ext/xmlrpc/tests/bug40576.phpt:1.1.2.3 php-src/ext/xmlrpc/tests/bug40576.phpt:1.1.2.4 --- php-src/ext/xmlrpc/tests/bug40576.phpt:1.1.2.3 Wed Feb 21 19:27:37 2007 +++ php-src/ext/xmlrpc/tests/bug40576.phpt Sun Feb 15 16:50:33 2009 @@ -29,11 +29,11 @@ /param /params -string(128) ?xml version=1.0 encoding=utf-8? +string(130) ?xml version=1.0 encoding=utf-8? params param value - double11234567891000/double + double1.1234567891E+13/double /value /param /params http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug45556.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/xmlrpc/tests/bug45556.phpt diff -u php-src/ext/xmlrpc/tests/bug45556.phpt:1.1.2.2 php-src/ext/xmlrpc/tests/bug45556.phpt:1.1.2.3 --- php-src/ext/xmlrpc/tests/bug45556.phpt:1.1.2.2 Tue Jan 27 15:02:43 2009 +++ php-src/ext/xmlrpc/tests/bug45556.phpt Sun Feb 15 16:50:33 2009 @@ -26,7 +26,7 @@ ? --EXPECTF-- Warning: xmlrpc_server_call_method(): Invalid callback 'foobar' passed in %s on line %d - + Warning: xmlrpc_server_call_method(): xml parse error: [line 1, column 1, message: Invalid document end] Unable to add introspection data returned from bar::test() in %s on line %d Warning: xmlrpc_server_call_method(): Invalid callback 'foo::bar' passed in %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 tar.c
cellog Sun Feb 15 18:51:46 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 tar.c Log: fix setting of 32-bit value on big-endian systems http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.10r2=1.27.2.11diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.10 php-src/ext/phar/config.m4:1.27.2.11 --- php-src/ext/phar/config.m4:1.27.2.10Wed Jan 28 20:39:15 2009 +++ php-src/ext/phar/config.m4 Sun Feb 15 18:51:46 2009 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27.2.10 2009/01/28 20:39:15 johannes Exp $ +dnl $Id: config.m4,v 1.27.2.11 2009/02/15 18:51:46 cellog Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, @@ -6,10 +6,10 @@ if test $PHP_PHAR != no; then PHP_C_BIGENDIAN - if test $ac_cv_c_bigendian_php = yes; then -AC_MSG_WARN([Disabling Phar due to crash bugs on big endian systems]) -PHP_PHAR=no - else +dnl if test $ac_cv_c_bigendian_php = yes; then +dnlAC_MSG_WARN([Disabling Phar due to crash bugs on big endian systems]) +dnlPHP_PHAR=no +dnl else PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) AC_MSG_CHECKING([for phar openssl support]) if test $PHP_HASH_SHARED != yes; then @@ -32,5 +32,5 @@ PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT - fi +dnl fi fi http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.55.2.25r2=1.55.2.26diff_format=u Index: php-src/ext/phar/tar.c diff -u php-src/ext/phar/tar.c:1.55.2.25 php-src/ext/phar/tar.c:1.55.2.26 --- php-src/ext/phar/tar.c:1.55.2.25Wed Dec 31 11:15:42 2008 +++ php-src/ext/phar/tar.c Sun Feb 15 18:51:46 2009 @@ -1084,10 +1084,10 @@ #ifdef WORDS_BIGENDIAN # define PHAR_SET_32(var, buffer) \ - *(php_uint32 *)(var) = (unsigned char*)(buffer))[3]) 24) \ - | unsigned char*)(buffer))[2]) 16) \ - | unsigned char*)(buffer))[1]) 8) \ - | (((unsigned char*)(buffer))[0])) + *(php_uint32 *)(var) = (unsigned char*)(buffer))[3]) 24) \ + | unsigned char*)(buffer))[2]) 16) \ + | unsigned char*)(buffer))[1]) 8) \ + | (((unsigned char*)(buffer))[0])) #else # define PHAR_SET_32(var, buffer) *(php_uint32 *)(var) = (php_uint32) (buffer) #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar tar.c
cellog Sun Feb 15 18:52:11 2009 UTC Modified files: /php-src/ext/phar tar.c Log: MFB: fix setting of 32-bit values on big-endian systems http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.65r2=1.66diff_format=u Index: php-src/ext/phar/tar.c diff -u php-src/ext/phar/tar.c:1.65 php-src/ext/phar/tar.c:1.66 --- php-src/ext/phar/tar.c:1.65 Wed Dec 31 11:12:35 2008 +++ php-src/ext/phar/tar.c Sun Feb 15 18:52:11 2009 @@ -1084,10 +1084,10 @@ #ifdef WORDS_BIGENDIAN # define PHAR_SET_32(var, buffer) \ - *(php_uint32 *)(var) = (unsigned char*)(buffer))[3]) 24) \ - | unsigned char*)(buffer))[2]) 16) \ - | unsigned char*)(buffer))[1]) 8) \ - | (((unsigned char*)(buffer))[0])) + *(php_uint32 *)(var) = (unsigned char*)(buffer))[3]) 24) \ + | unsigned char*)(buffer))[2]) 16) \ + | unsigned char*)(buffer))[1]) 8) \ + | (((unsigned char*)(buffer))[0])) #else # define PHAR_SET_32(var, buffer) *(php_uint32 *)(var) = (php_uint32) (buffer) #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4
cellog Sun Feb 15 18:53:22 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 Log: revert accidental commit of config.m4, big-endian isn't ready quite yet http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.11r2=1.27.2.12diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.11 php-src/ext/phar/config.m4:1.27.2.12 --- php-src/ext/phar/config.m4:1.27.2.11Sun Feb 15 18:51:46 2009 +++ php-src/ext/phar/config.m4 Sun Feb 15 18:53:22 2009 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27.2.11 2009/02/15 18:51:46 cellog Exp $ +dnl $Id: config.m4,v 1.27.2.12 2009/02/15 18:53:22 cellog Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, @@ -6,10 +6,10 @@ if test $PHP_PHAR != no; then PHP_C_BIGENDIAN -dnl if test $ac_cv_c_bigendian_php = yes; then -dnlAC_MSG_WARN([Disabling Phar due to crash bugs on big endian systems]) -dnlPHP_PHAR=no -dnl else + if test $ac_cv_c_bigendian_php = yes; then +AC_MSG_WARN([Disabling Phar due to crash bugs on big endian systems]) +PHP_PHAR=no + else PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) AC_MSG_CHECKING([for phar openssl support]) if test $PHP_HASH_SHARED != yes; then @@ -32,5 +32,5 @@ PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT -dnl fi + fi fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar zip.c
cellog Sun Feb 15 19:22:42 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar zip.c
Log:
fix getting/setting of all 16/32 values in zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/zip.c?r1=1.47.2.25r2=1.47.2.26diff_format=u
Index: php-src/ext/phar/zip.c
diff -u php-src/ext/phar/zip.c:1.47.2.25 php-src/ext/phar/zip.c:1.47.2.26
--- php-src/ext/phar/zip.c:1.47.2.25Wed Dec 31 11:15:42 2008
+++ php-src/ext/phar/zip.c Sun Feb 15 19:22:42 2009
@@ -19,12 +19,19 @@
#include phar_internal.h
#ifdef WORDS_BIGENDIAN
-# define PHAR_GET_32(buffer) (unsigned char*)(buffer))[3]) 24) \
- | unsigned char*)(buffer))[2]) 16) \
- | unsigned char*)(buffer))[1]) 8) \
- | (((unsigned char*)(buffer))[0]))
-# define PHAR_GET_16(buffer) (unsigned char*)(buffer))[1]) 8) \
- | (((unsigned char*)(buffer))[0]))
+static inline php_uint32 phar_fix_32(php_uint32 buffer)
+{
+ return unsigned char *)buffer)[3]) 24) |
+ unsigned char *)buffer)[2]) 16) |
+ unsigned char *)buffer)[1]) 8) |
+ (((unsigned char *)buffer)[0]);
+}
+static inline php_uint16 phar_fix_16(php_uint16 buffer)
+{
+ return unsigned char *)buffer)[1]) 8) | ((unsigned char
*)buffer)[0];
+}
+# define PHAR_GET_32(buffer) phar_fix_32((php_uint32)(buffer))
+# define PHAR_GET_16(buffer) phar_fix_16((php_uint16)(buffer))
# define PHAR_SET_32(buffer) PHAR_GET_32(buffer)
# define PHAR_SET_16(buffer) PHAR_GET_16(buffer)
#else
@@ -687,7 +694,6 @@
php_uint32 newcrc32;
off_t offset;
int not_really_modified = 0;
-
entry = (phar_entry_info *)data;
p = (struct _phar_zip_pass*) arg;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar zip.c
cellog Sun Feb 15 19:23:06 2009 UTC
Modified files:
/php-src/ext/phar zip.c
Log:
MFB: fix getting/setting of all 16/32 bit on zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/zip.c?r1=1.60r2=1.61diff_format=u
Index: php-src/ext/phar/zip.c
diff -u php-src/ext/phar/zip.c:1.60 php-src/ext/phar/zip.c:1.61
--- php-src/ext/phar/zip.c:1.60 Wed Dec 31 11:12:35 2008
+++ php-src/ext/phar/zip.c Sun Feb 15 19:23:06 2009
@@ -19,12 +19,19 @@
#include phar_internal.h
#ifdef WORDS_BIGENDIAN
-# define PHAR_GET_32(buffer) (unsigned char*)(buffer))[3]) 24) \
- | unsigned char*)(buffer))[2]) 16) \
- | unsigned char*)(buffer))[1]) 8) \
- | (((unsigned char*)(buffer))[0]))
-# define PHAR_GET_16(buffer) (unsigned char*)(buffer))[1]) 8) \
- | (((unsigned char*)(buffer))[0]))
+static inline php_uint32 phar_fix_32(php_uint32 buffer)
+{
+ return unsigned char *)buffer)[3]) 24) |
+ unsigned char *)buffer)[2]) 16) |
+ unsigned char *)buffer)[1]) 8) |
+ (((unsigned char *)buffer)[0]);
+}
+static inline php_uint16 phar_fix_16(php_uint16 buffer)
+{
+ return unsigned char *)buffer)[1]) 8) | ((unsigned char
*)buffer)[0];
+}
+# define PHAR_GET_32(buffer) phar_fix_32((php_uint32)(buffer))
+# define PHAR_GET_16(buffer) phar_fix_16((php_uint16)(buffer))
# define PHAR_SET_32(buffer) PHAR_GET_32(buffer)
# define PHAR_SET_16(buffer) PHAR_GET_16(buffer)
#else
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.c zip.c
cellog Sun Feb 15 20:29:13 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar.c zip.c
Log:
fix remaining big-endian issues with phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.56r2=1.370.2.57diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.56 php-src/ext/phar/phar.c:1.370.2.57
--- php-src/ext/phar/phar.c:1.370.2.56 Fri Jan 2 20:43:41 2009
+++ php-src/ext/phar/phar.c Sun Feb 15 20:29:13 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.370.2.56 2009/01/02 20:43:41 iliaa Exp $ */
+/* $Id: phar.c,v 1.370.2.57 2009/02/15 20:29:13 cellog Exp $ */
#define PHAR_MAIN 1
#include phar_internal.h
@@ -510,12 +510,19 @@
var = unsigned char*)(buffer))[1]) 8) \
| (((unsigned char*)(buffer))[0]); \
(buffer) += 2
-# define PHAR_ZIP_32(buffer) unsigned char*)(buffer))[3]) 24) \
- | unsigned char*)(buffer))[2]) 16) \
- | unsigned char*)(buffer))[1]) 8) \
- | (((unsigned char*)(buffer))[0])
-# define PHAR_ZIP_16(buffer) unsigned char*)(buffer))[1]) 8) \
- | (((unsigned char*)(buffer))[0])
+static inline php_uint32 phar_fix_32(php_uint32 buffer)
+{
+ return unsigned char *)buffer)[3]) 24) |
+ unsigned char *)buffer)[2]) 16) |
+ unsigned char *)buffer)[1]) 8) |
+ (((unsigned char *)buffer)[0]);
+}
+static inline php_uint16 phar_fix_16(php_uint16 buffer)
+{
+ return unsigned char *)buffer)[1]) 8) | ((unsigned char
*)buffer)[0];
+}
+# define PHAR_ZIP_32(buffer) phar_fix_32((php_uint32)(buffer))
+# define PHAR_ZIP_16(buffer) phar_fix_16((php_uint16)(buffer))
#else
# define PHAR_GET_32(buffer, var) \
var = *(php_uint32*)(buffer); \
@@ -3626,7 +3633,7 @@
php_info_print_table_header(2, Phar: PHP Archive support, enabled);
php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION);
php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.56 $);
+ php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.57 $);
php_info_print_table_row(2, Phar-based phar archives, enabled);
php_info_print_table_row(2, Tar-based phar archives, enabled);
php_info_print_table_row(2, ZIP-based phar archives, enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/zip.c?r1=1.47.2.26r2=1.47.2.27diff_format=u
Index: php-src/ext/phar/zip.c
diff -u php-src/ext/phar/zip.c:1.47.2.26 php-src/ext/phar/zip.c:1.47.2.27
--- php-src/ext/phar/zip.c:1.47.2.26Sun Feb 15 19:22:42 2009
+++ php-src/ext/phar/zip.c Sun Feb 15 20:29:13 2009
@@ -383,7 +383,7 @@
php_stream_seek(fp, loc +
PHAR_GET_16(zipentry.extra_len), SEEK_SET);
}
- switch (zipentry.compressed) {
+ switch (PHAR_GET_16(zipentry.compressed)) {
case PHAR_ZIP_COMP_NONE :
/* compression flag already set */
break;
@@ -450,7 +450,7 @@
}
p = buf;
- entry.metadata_len = zipentry.comment_len;
+ entry.metadata_len = PHAR_GET_16(zipentry.comment_len);
if (phar_parse_metadata(p, (entry.metadata),
PHAR_GET_16(zipentry.comment_len) TSRMLS_CC) == FAILURE) {
entry.metadata_len = 0;
@@ -996,6 +996,7 @@
char *temperr = NULL;
struct _phar_zip_pass pass;
phar_zip_dir_end eocd;
+ php_uint32 cdir_size, cdir_offset;
pass.error = temperr;
entry.flags = PHAR_ENT_PERM_DEF_FILE;
@@ -1197,7 +1198,7 @@
memset(eocd, 0, sizeof(eocd));
strncpy(eocd.signature, PK\5\6, 4);
- eocd.counthere = eocd.count = zend_hash_num_elements(phar-manifest);
+ eocd.counthere = eocd.count =
PHAR_GET_16(zend_hash_num_elements(phar-manifest));
zend_hash_apply_with_argument(phar-manifest, phar_zip_changed_apply,
(void *) pass TSRMLS_CC);
if (temperr) {
@@ -1216,11 +1217,13 @@
}
/* save zip */
- eocd.cdir_size = php_stream_tell(pass.centralfp);
- eocd.cdir_offset = php_stream_tell(pass.filefp);
+ cdir_size = php_stream_tell(pass.centralfp);
+ cdir_offset = php_stream_tell(pass.filefp);
+ eocd.cdir_size = PHAR_SET_32(cdir_size);
+ eocd.cdir_offset = PHAR_SET_32(cdir_offset);
php_stream_seek(pass.centralfp, 0, SEEK_SET);
- if (eocd.cdir_size != php_stream_copy_to_stream(pass.centralfp,
pass.filefp, PHP_STREAM_COPY_ALL)) {
+ if (cdir_size != php_stream_copy_to_stream(pass.centralfp, pass.filefp,
PHP_STREAM_COPY_ALL)) {
if (error) {
[PHP-CVS] cvs: php-src /ext/phar phar.c zip.c
cellog Sun Feb 15 20:29:26 2009 UTC
Modified files:
/php-src/ext/phar phar.c zip.c
Log:
MFB: fix all remaining big-endian issues
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.394r2=1.395diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.394 php-src/ext/phar/phar.c:1.395
--- php-src/ext/phar/phar.c:1.394 Fri Jan 2 20:43:58 2009
+++ php-src/ext/phar/phar.c Sun Feb 15 20:29:26 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.394 2009/01/02 20:43:58 iliaa Exp $ */
+/* $Id: phar.c,v 1.395 2009/02/15 20:29:26 cellog Exp $ */
#define PHAR_MAIN 1
#include phar_internal.h
@@ -510,12 +510,19 @@
var = unsigned char*)(buffer))[1]) 8) \
| (((unsigned char*)(buffer))[0]); \
(buffer) += 2
-# define PHAR_ZIP_32(buffer) unsigned char*)(buffer))[3]) 24) \
- | unsigned char*)(buffer))[2]) 16) \
- | unsigned char*)(buffer))[1]) 8) \
- | (((unsigned char*)(buffer))[0])
-# define PHAR_ZIP_16(buffer) unsigned char*)(buffer))[1]) 8) \
- | (((unsigned char*)(buffer))[0])
+static inline php_uint32 phar_fix_32(php_uint32 buffer)
+{
+ return unsigned char *)buffer)[3]) 24) |
+ unsigned char *)buffer)[2]) 16) |
+ unsigned char *)buffer)[1]) 8) |
+ (((unsigned char *)buffer)[0]);
+}
+static inline php_uint16 phar_fix_16(php_uint16 buffer)
+{
+ return unsigned char *)buffer)[1]) 8) | ((unsigned char
*)buffer)[0];
+}
+# define PHAR_ZIP_32(buffer) phar_fix_32((php_uint32)(buffer))
+# define PHAR_ZIP_16(buffer) phar_fix_16((php_uint16)(buffer))
#else
# define PHAR_GET_32(buffer, var) \
var = *(php_uint32*)(buffer); \
@@ -3626,7 +3633,7 @@
php_info_print_table_header(2, Phar: PHP Archive support, enabled);
php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION);
php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, CVS revision, $Revision: 1.394 $);
+ php_info_print_table_row(2, CVS revision, $Revision: 1.395 $);
php_info_print_table_row(2, Phar-based phar archives, enabled);
php_info_print_table_row(2, Tar-based phar archives, enabled);
php_info_print_table_row(2, ZIP-based phar archives, enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/zip.c?r1=1.61r2=1.62diff_format=u
Index: php-src/ext/phar/zip.c
diff -u php-src/ext/phar/zip.c:1.61 php-src/ext/phar/zip.c:1.62
--- php-src/ext/phar/zip.c:1.61 Sun Feb 15 19:23:06 2009
+++ php-src/ext/phar/zip.c Sun Feb 15 20:29:26 2009
@@ -383,7 +383,7 @@
php_stream_seek(fp, loc +
PHAR_GET_16(zipentry.extra_len), SEEK_SET);
}
- switch (zipentry.compressed) {
+ switch (PHAR_GET_16(zipentry.compressed)) {
case PHAR_ZIP_COMP_NONE :
/* compression flag already set */
break;
@@ -450,7 +450,7 @@
}
p = buf;
- entry.metadata_len = zipentry.comment_len;
+ entry.metadata_len = PHAR_GET_16(zipentry.comment_len);
if (phar_parse_metadata(p, (entry.metadata),
PHAR_GET_16(zipentry.comment_len) TSRMLS_CC) == FAILURE) {
entry.metadata_len = 0;
@@ -997,6 +997,7 @@
char *temperr = NULL;
struct _phar_zip_pass pass;
phar_zip_dir_end eocd;
+ php_uint32 cdir_size, cdir_offset;
pass.error = temperr;
entry.flags = PHAR_ENT_PERM_DEF_FILE;
@@ -1198,7 +1199,7 @@
memset(eocd, 0, sizeof(eocd));
strncpy(eocd.signature, PK\5\6, 4);
- eocd.counthere = eocd.count = zend_hash_num_elements(phar-manifest);
+ eocd.counthere = eocd.count =
PHAR_GET_16(zend_hash_num_elements(phar-manifest));
zend_hash_apply_with_argument(phar-manifest, phar_zip_changed_apply,
(void *) pass TSRMLS_CC);
if (temperr) {
@@ -1217,11 +1218,13 @@
}
/* save zip */
- eocd.cdir_size = php_stream_tell(pass.centralfp);
- eocd.cdir_offset = php_stream_tell(pass.filefp);
+ cdir_size = php_stream_tell(pass.centralfp);
+ cdir_offset = php_stream_tell(pass.filefp);
+ eocd.cdir_size = PHAR_SET_32(cdir_size);
+ eocd.cdir_offset = PHAR_SET_32(cdir_offset);
php_stream_seek(pass.centralfp, 0, SEEK_SET);
- if (eocd.cdir_size != php_stream_copy_to_stream(pass.centralfp,
pass.filefp, PHP_STREAM_COPY_ALL)) {
+ if (cdir_size != php_stream_copy_to_stream(pass.centralfp, pass.filefp,
PHP_STREAM_COPY_ALL)) {
if (error) {
spprintf(error, 4096, phar zip flush of \%s\ failed:
unable to
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/tests/cache_list copyonwrite6.phar.phpt /ext/phar/tests/cache_list/files write6.phar write6.phar.inc
cellog Sun Feb 15 21:43:39 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar/tests/cache_list copyonwrite6.phar.phpt
/php-src/ext/phar/tests/cache_list/fileswrite6.phar
write6.phar.inc
Log:
fix the last remaining failing test (explicitly pass in SKIP_DOTS to
directory iterator)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt
diff -u php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt:1.1.2.1
php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt:1.1.2.2
--- php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt:1.1.2.1Mon Oct
13 04:21:08 2008
+++ php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phptSun Feb 15
21:43:39 2009
@@ -4,6 +4,7 @@
default_charset=UTF-8
phar.cache_list={PWD}/copyonwrite6.phar.php
phar.readonly=0
+open_basedir=
--SKIPIF--
?php if (!extension_loaded(phar)) die(skip); ?
--FILE_EXTERNAL--
@@ -24,4 +25,4 @@
phar://%scopyonwrite6.phar.php%cfile1 file1
phar://%scopyonwrite6.phar.php%cfile2 file2
phar://%scopyonwrite6.phar.php%chi hi
-ok
\ No newline at end of file
+ok
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/write6.phar?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/write6.phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/write6.phar.inc?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/write6.phar.inc
diff -u php-src/ext/phar/tests/cache_list/files/write6.phar.inc:1.1.2.1
php-src/ext/phar/tests/cache_list/files/write6.phar.inc:1.1.2.2
--- php-src/ext/phar/tests/cache_list/files/write6.phar.inc:1.1.2.1 Mon Oct
13 04:21:09 2008
+++ php-src/ext/phar/tests/cache_list/files/write6.phar.inc Sun Feb 15
21:43:39 2009
@@ -10,7 +10,7 @@
mkdir($d);
file_put_contents($d . /file1, file1\n);
file_put_contents($d . /file2, file2\n);
-var_dump($phar-buildFromIterator(new RecursiveDirectoryIterator($d),$d));
+var_dump($phar-buildFromIterator(new RecursiveDirectoryIterator($d,
RecursiveDirectoryIterator::SKIP_DOTS),$d));
$phar2 = new Phar(__FILE__);
$arr = array();
foreach ($phar2 as $name = $file) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/general_functions phpinfo.phpt
tony2001Sun Feb 15 21:46:01 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/general_functions phpinfo.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpinfo.phpt?r1=1.1.2.2.2.7r2=1.1.2.2.2.8diff_format=u Index: php-src/ext/standard/tests/general_functions/phpinfo.phpt diff -u php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2.2.7 php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2.2.8 --- php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.1.2.2.2.7 Sat Jan 17 17:59:51 2009 +++ php-src/ext/standard/tests/general_functions/phpinfo.phpt Sun Feb 15 21:46:01 2009 @@ -47,6 +47,8 @@ Configuration +%a + Core %a -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions phpinfo.phpt
tony2001Sun Feb 15 21:48:07 2009 UTC Modified files: /php-src/ext/standard/tests/general_functions phpinfo.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/phpinfo.phpt?r1=1.8r2=1.9diff_format=u Index: php-src/ext/standard/tests/general_functions/phpinfo.phpt diff -u php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.8 php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.9 --- php-src/ext/standard/tests/general_functions/phpinfo.phpt:1.8 Sat Jan 17 18:29:17 2009 +++ php-src/ext/standard/tests/general_functions/phpinfo.phpt Sun Feb 15 21:48:07 2009 @@ -48,6 +48,8 @@ Configuration +%a + Core %a -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_firebird firebird_driver.c
felipe Sun Feb 15 21:48:54 2009 UTC
Modified files:
/php-src/ext/pdo_firebird firebird_driver.c
Log:
- Fixed bug #47398 (PDO_Firebird doesn't implements quoter correctly)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/firebird_driver.c?r1=1.25r2=1.26diff_format=u
Index: php-src/ext/pdo_firebird/firebird_driver.c
diff -u php-src/ext/pdo_firebird/firebird_driver.c:1.25
php-src/ext/pdo_firebird/firebird_driver.c:1.26
--- php-src/ext/pdo_firebird/firebird_driver.c:1.25 Wed Dec 31 11:12:34 2008
+++ php-src/ext/pdo_firebird/firebird_driver.c Sun Feb 15 21:48:54 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: firebird_driver.c,v 1.25 2008/12/31 11:12:34 sebastian Exp $ */
+/* $Id: firebird_driver.c,v 1.26 2009/02/15 21:48:54 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -274,38 +274,38 @@
char **quoted, int *quotedlen, enum pdo_param_type paramtype TSRMLS_DC)
{
int qcount = 0;
- char const *c;
+ char const *co, *l, *r;
+ char *c;
+ if (!unquotedlen) {
+ *quotedlen = 2;
+ *quoted = emalloc(*quotedlen+1);
+ strcpy(*quoted, '');
+ return 1;
+ }
+
/* Firebird only requires single quotes to be doubled if string lengths
are used */
-
/* count the number of ' characters */
- for (c = unquoted; (c = strchr(c,'\'')); qcount++, c++);
+ for (co = unquoted; (co = strchr(co,'\'')); qcount++, co++);
- if (!qcount) {
- return 0;
- } else {
- char const *l, *r;
- char *c;
-
- *quotedlen = unquotedlen + qcount;
- *quoted = c = emalloc(*quotedlen+1);
-
- /* foreach (chunk that ends in a quote) */
- for (l = unquoted; (r = strchr(l,'\'')); l = r+1) {
-
- /* copy the chunk */
- strncpy(c, l, r-l);
- c += (r-l);
-
- /* add the second quote */
- *c++ = '\'';
- }
-
- /* copy the remainder */
- strncpy(c, l, *quotedlen-(c-*quoted));
-
- return 1;
- }
+ *quotedlen = unquotedlen + qcount + 2;
+ *quoted = c = emalloc(*quotedlen+1);
+ *c++ = '\'';
+
+ /* foreach (chunk that ends in a quote) */
+ for (l = unquoted; (r = strchr(l,'\'')); l = r+1) {
+ strncpy(c, l, r-l+1);
+ c += (r-l+1);
+ /* add the second quote */
+ *c++ = '\'';
+ }
+
+ /* copy the remainder */
+ strncpy(c, l, *quotedlen-(c-*quoted)-1);
+ (*quoted)[*quotedlen-1] = '\'';
+ (*quoted)[*quotedlen] = '\0';
+
+ return 1;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar/tests/cache_list copyonwrite6.phar.phpt /ext/phar/tests/cache_list/files write6.phar write6.phar.inc
cellog Sun Feb 15 21:50:58 2009 UTC
Modified files:
/php-src/ext/phar/tests/cache_list copyonwrite6.phar.phpt
/php-src/ext/phar/tests/cache_list/fileswrite6.phar
write6.phar.inc
Log:
MFB: fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt
diff -u php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt:1.2
php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt:1.3
--- php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phpt:1.2Mon Oct
13 04:21:19 2008
+++ php-src/ext/phar/tests/cache_list/copyonwrite6.phar.phptSun Feb 15
21:50:58 2009
@@ -4,6 +4,7 @@
default_charset=UTF-8
phar.cache_list={PWD}/copyonwrite6.phar.php
phar.readonly=0
+open_basedir=
--SKIPIF--
?php if (!extension_loaded(phar)) die(skip); ?
--FILE_EXTERNAL--
@@ -24,4 +25,4 @@
phar://%scopyonwrite6.phar.php%cfile1 file1
phar://%scopyonwrite6.phar.php%cfile2 file2
phar://%scopyonwrite6.phar.php%chi hi
-ok
\ No newline at end of file
+ok
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/write6.phar?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/write6.phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/write6.phar.inc?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/write6.phar.inc
diff -u php-src/ext/phar/tests/cache_list/files/write6.phar.inc:1.2
php-src/ext/phar/tests/cache_list/files/write6.phar.inc:1.3
--- php-src/ext/phar/tests/cache_list/files/write6.phar.inc:1.2 Mon Oct 13
04:21:19 2008
+++ php-src/ext/phar/tests/cache_list/files/write6.phar.inc Sun Feb 15
21:50:58 2009
@@ -10,7 +10,7 @@
mkdir($d);
file_put_contents($d . /file1, file1\n);
file_put_contents($d . /file2, file2\n);
-var_dump($phar-buildFromIterator(new RecursiveDirectoryIterator($d),$d));
+var_dump($phar-buildFromIterator(new RecursiveDirectoryIterator($d,
RecursiveDirectoryIterator::SKIP_DOTS),$d));
$phar2 = new Phar(__FILE__);
$arr = array();
foreach ($phar2 as $name = $file) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/pdo_firebird firebird_driver.c
felipe Sun Feb 15 21:51:00 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_firebird firebird_driver.c
/php-srcNEWS
Log:
- Fixed bug #47398 (PDO_Firebird doesn't implements quoter correctly)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/firebird_driver.c?r1=1.17.2.2.2.4.2.5r2=1.17.2.2.2.4.2.6diff_format=u
Index: php-src/ext/pdo_firebird/firebird_driver.c
diff -u php-src/ext/pdo_firebird/firebird_driver.c:1.17.2.2.2.4.2.5
php-src/ext/pdo_firebird/firebird_driver.c:1.17.2.2.2.4.2.6
--- php-src/ext/pdo_firebird/firebird_driver.c:1.17.2.2.2.4.2.5 Wed Dec 31
11:15:41 2008
+++ php-src/ext/pdo_firebird/firebird_driver.c Sun Feb 15 21:51:00 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: firebird_driver.c,v 1.17.2.2.2.4.2.5 2008/12/31 11:15:41 sebastian Exp
$ */
+/* $Id: firebird_driver.c,v 1.17.2.2.2.4.2.6 2009/02/15 21:51:00 felipe Exp $
*/
#ifdef HAVE_CONFIG_H
#include config.h
@@ -274,38 +274,38 @@
char **quoted, int *quotedlen, enum pdo_param_type paramtype TSRMLS_DC)
{
int qcount = 0;
- char const *c;
+ char const *co, *l, *r;
+ char *c;
+ if (!unquotedlen) {
+ *quotedlen = 2;
+ *quoted = emalloc(*quotedlen+1);
+ strcpy(*quoted, '');
+ return 1;
+ }
+
/* Firebird only requires single quotes to be doubled if string lengths
are used */
-
/* count the number of ' characters */
- for (c = unquoted; (c = strchr(c,'\'')); qcount++, c++);
+ for (co = unquoted; (co = strchr(co,'\'')); qcount++, co++);
- if (!qcount) {
- return 0;
- } else {
- char const *l, *r;
- char *c;
-
- *quotedlen = unquotedlen + qcount;
- *quoted = c = emalloc(*quotedlen+1);
-
- /* foreach (chunk that ends in a quote) */
- for (l = unquoted; (r = strchr(l,'\'')); l = r+1) {
-
- /* copy the chunk */
- strncpy(c, l, r-l);
- c += (r-l);
-
- /* add the second quote */
- *c++ = '\'';
- }
-
- /* copy the remainder */
- strncpy(c, l, *quotedlen-(c-*quoted));
-
- return 1;
- }
+ *quotedlen = unquotedlen + qcount + 2;
+ *quoted = c = emalloc(*quotedlen+1);
+ *c++ = '\'';
+
+ /* foreach (chunk that ends in a quote) */
+ for (l = unquoted; (r = strchr(l,'\'')); l = r+1) {
+ strncpy(c, l, r-l+1);
+ c += (r-l+1);
+ /* add the second quote */
+ *c++ = '\'';
+ }
+
+ /* copy the remainder */
+ strncpy(c, l, *quotedlen-(c-*quoted)-1);
+ (*quoted)[*quotedlen-1] = '\'';
+ (*quoted)[*quotedlen] = '\0';
+
+ return 1;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.493r2=1.2027.2.547.2.965.2.494diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.493
php-src/NEWS:1.2027.2.547.2.965.2.494
--- php-src/NEWS:1.2027.2.547.2.965.2.493 Fri Feb 13 12:21:06 2009
+++ php-src/NEWSSun Feb 15 21:51:00 2009
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2009, PHP 5.3.0 Beta 2
+- Fixed bug #47398 (PDO_Firebird doesn't implements quoter correctly). (Felipe)
- Fixed bug #47329 (Crash in garbage collector). (Dmitry)
- Fixed bug #47320 ($php_errormsg out of scope in functions). (Dmitry)
- Fixed bug #47265 (generating phar.phar failes because of safe_mode). (Greg)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src /main output.c /tests/output bug46900.phpt bug46903.phpt ob_014.phpt ob_015.phpt ob_start_basic_002.phpt ob_start_basic_004.phpt
Robin Fernandes wrote:
robinf Sun Dec 28 19:50:58 2008 UTC
Added files:
/php-src/tests/output bug46903.phpt bug46900.phpt
Modified files:
/php-src/tests/output ob_start_basic_004.phpt
ob_start_basic_002.phpt ob_015.phpt
ob_014.phpt
/php-src/main output.c
Log:
Fix bugs #46900 and #46903.
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.214r2=1.215diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.214 php-src/main/output.c:1.215
--- php-src/main/output.c:1.214 Mon Aug 18 07:45:59 2008
+++ php-src/main/output.c Sun Dec 28 19:50:58 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: output.c,v 1.214 2008/08/18 07:45:59 tony2001 Exp $ */
+/* $Id: output.c,v 1.215 2008/12/28 19:50:58 robinf Exp $ */
#ifndef PHP_OUTPUT_DEBUG
# define PHP_OUTPUT_DEBUG 0
@@ -1342,6 +1342,8 @@
}
if (chunk_size 0) {
chunk_size = 0;
+ } else if (chunk_size == 1) {
+ chunk_size = 4096;
}
if (SUCCESS != php_output_start_user(output_handler, chunk_size, flags
TSRMLS_CC)) {
The documentation stated IMHO silly magic behavior of the old output
layer. Why start sprinkling the new code with useless magic meanings?
Regards,
Mike
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring/libmbfl/filters mbfilter_cp932.c mbfilter_sjis.c /ext/mbstring/tests bug47399.phpt
moriyoshi Mon Feb 16 01:57:13 2009 UTC
Added files:
/php-src/ext/mbstring/tests bug47399.phpt
Modified files:
/php-src/ext/mbstring/libmbfl/filters mbfilter_cp932.c
mbfilter_sjis.c
Log:
- Fix bug #47399 (mb_check_encoding() returns true for some illegal SJIS
characters).
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c:1.1
php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c:1.2
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c:1.1 Sat Aug 23
06:18:36 2003
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c Mon Feb 16
01:57:13 2009
@@ -167,7 +167,7 @@
case 1: /* kanji second char */
filter-status = 0;
c1 = filter-cache;
- if (c 0x39 c 0xfd c != 0x7f) {
+ if (c = 0x40 c = 0xfc c != 0x7f) {
w = 0;
SJIS_DECODE(c1, c, s1, s2);
s = (s1 - 0x21)*94 + s2 - 0x21;
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c:1.1
php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c:1.2
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c:1.1Sat Aug 23
06:18:36 2003
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.cMon Feb 16
01:57:13 2009
@@ -167,7 +167,7 @@
case 1: /* kanji second char */
filter-status = 0;
c1 = filter-cache;
- if (c 0x39 c 0xfd c != 0x7f) {
+ if (c = 0x40 c = 0xfc c != 0x7f) {
SJIS_DECODE(c1, c, s1, s2);
w = (s1 - 0x21)*94 + s2 - 0x21;
if (w = 0 w jisx0208_ucs_table_size) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug47399.phpt?view=markuprev=1.1
Index: php-src/ext/mbstring/tests/bug47399.phpt
+++ php-src/ext/mbstring/tests/bug47399.phpt
--TEST--
Bug #47399 (mb_check_encoding() returns true for some illegal SJIS characters)
--FILE--
?php
foreach (array(Shift_JIS, CP932) as $enc) {
for ($a = 0; $a 256; $a++) {
var_dump(mb_check_encoding(\x81.pack(c, $a), $enc));
}
}
?
--EXPECT--
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(false)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring/libmbfl/filters mbfilter_cp932.c mbfilter_sjis.c
moriyoshi Mon Feb 16 01:57:37 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring/libmbfl/filters mbfilter_cp932.c
mbfilter_sjis.c
Log:
- MFH: Fix bug #47399 (mb_check_encoding() return true for some illegal SJIS
charcters)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c?r1=1.1r2=1.1.10.1diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c:1.1
php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c:1.1.10.1
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c:1.1 Sat Aug 23
06:18:36 2003
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c Mon Feb 16
01:57:37 2009
@@ -167,7 +167,7 @@
case 1: /* kanji second char */
filter-status = 0;
c1 = filter-cache;
- if (c 0x39 c 0xfd c != 0x7f) {
+ if (c = 0x40 c = 0xfc c != 0x7f) {
w = 0;
SJIS_DECODE(c1, c, s1, s2);
s = (s1 - 0x21)*94 + s2 - 0x21;
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c?r1=1.1r2=1.1.10.1diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c:1.1
php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c:1.1.10.1
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c:1.1Sat Aug 23
06:18:36 2003
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.cMon Feb 16
01:57:37 2009
@@ -167,7 +167,7 @@
case 1: /* kanji second char */
filter-status = 0;
c1 = filter-cache;
- if (c 0x39 c 0xfd c != 0x7f) {
+ if (c = 0x40 c = 0xfc c != 0x7f) {
SJIS_DECODE(c1, c, s1, s2);
w = (s1 - 0x21)*94 + s2 - 0x21;
if (w = 0 w jisx0208_ucs_table_size) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/mbstring/libmbfl/filters mbfilter_cp932.c mbfilter_sjis.c
moriyoshi Mon Feb 16 01:58:16 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/mbstring/libmbfl/filters mbfilter_cp932.c
mbfilter_sjis.c
Log:
- MFH: Fix bug #47399 mb_check_encoding() return true for some illegal SJIS
characrters.
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1420r2=1.2027.2.547.2.1421diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1420 php-src/NEWS:1.2027.2.547.2.1421
--- php-src/NEWS:1.2027.2.547.2.1420Sun Feb 15 14:31:55 2009
+++ php-src/NEWSMon Feb 16 01:58:16 2009
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? Feb 2009, PHP 5.2.9
+- Fixed bug #47399 (mb_check_encoding() returns true for some illegal SJIS
+ characters). (for-bugs at hnw dot jp, Moriyoshi)
- Fixed bug #45923 (mb_st[r]ripos() offset not handled correctly). (Moriyoshi)
- Fixed bug #43841 (mb_strrpos() offset is byte count for negative values).
(Moriyoshi)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c?r1=1.1r2=1.1.8.1diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c:1.1
php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c:1.1.8.1
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c:1.1 Sat Aug 23
06:18:36 2003
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_cp932.c Mon Feb 16
01:58:16 2009
@@ -167,7 +167,7 @@
case 1: /* kanji second char */
filter-status = 0;
c1 = filter-cache;
- if (c 0x39 c 0xfd c != 0x7f) {
+ if (c = 0x40 c = 0xfc c != 0x7f) {
w = 0;
SJIS_DECODE(c1, c, s1, s2);
s = (s1 - 0x21)*94 + s2 - 0x21;
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c?r1=1.1r2=1.1.8.1diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c:1.1
php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c:1.1.8.1
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.c:1.1Sat Aug 23
06:18:36 2003
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_sjis.cMon Feb 16
01:58:16 2009
@@ -167,7 +167,7 @@
case 1: /* kanji second char */
filter-status = 0;
c1 = filter-cache;
- if (c 0x39 c 0xfd c != 0x7f) {
+ if (c = 0x40 c = 0xfc c != 0x7f) {
SJIS_DECODE(c1, c, s1, s2);
w = (s1 - 0x21)*94 + s2 - 0x21;
if (w = 0 w jisx0208_ucs_table_size) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring/tests bug47399.phpt
moriyoshi Mon Feb 16 02:10:45 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mbstring/tests bug47399.phpt
Log:
- Test.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug47399.phpt?view=markuprev=1.1
Index: php-src/ext/mbstring/tests/bug47399.phpt
+++ php-src/ext/mbstring/tests/bug47399.phpt
--TEST--
Bug #47399 (mb_check_encoding() returns true for some illegal SJIS characters)
--FILE--
?php
foreach (array(Shift_JIS, CP932) as $enc) {
for ($a = 0; $a 256; $a++) {
var_dump(mb_check_encoding(\x81.pack(c, $a), $enc));
}
}
?
--EXPECT--
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(false)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(false)
bool(true)
bool(true)
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring/tests bug47399.phpt
moriyoshi Mon Feb 16 02:11:02 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/mbstring/tests bug47399.phpt
Log:
- MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug47399.phpt?view=markuprev=1.1
Index: php-src/ext/mbstring/tests/bug47399.phpt
+++ php-src/ext/mbstring/tests/bug47399.phpt
--TEST--
Bug #47399 (mb_check_encoding() returns true for some illegal SJIS characters)
--FILE--
?php
foreach (array(Shift_JIS, CP932) as $enc) {
for ($a = 0; $a 256; $a++) {
var_dump(mb_check_encoding(\x81.pack(c, $a), $enc));
}
}
?
--EXPECT--
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(false)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(true)
bool(false)
bool(true)
bool(true)
[PHP-CVS] Re: cvs: php-src /main output.c /tests/output bug46900.phpt bug46903.phpt ob_014.phpt ob_015.phpt ob_start_basic_002.phpt ob_start_basic_004.phpt
2009/2/15 Michael Wallner m...@php.net:
Robin Fernandes wrote:
robinf Sun Dec 28 19:50:58 2008 UTC
Added files:/php-src/tests/output bug46903.phpt
bug46900.phpt
Modified files: /php-src/tests/output
ob_start_basic_004.phpt
ob_start_basic_002.phpt ob_015.phpt
ob_014.phpt/php-src/main output.c Log:
Fix bugs #46900 and #46903.
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.214r2=1.215diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.214 php-src/main/output.c:1.215
--- php-src/main/output.c:1.214 Mon Aug 18 07:45:59 2008
+++ php-src/main/output.c Sun Dec 28 19:50:58 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: output.c,v 1.214 2008/08/18 07:45:59 tony2001 Exp $ */
+/* $Id: output.c,v 1.215 2008/12/28 19:50:58 robinf Exp $ */
#ifndef PHP_OUTPUT_DEBUG
# define PHP_OUTPUT_DEBUG 0
@@ -1342,6 +1342,8 @@
}
if (chunk_size 0) {
chunk_size = 0;
+ } else if (chunk_size == 1) {
+ chunk_size = 4096;
}
if (SUCCESS != php_output_start_user(output_handler, chunk_size,
flags TSRMLS_CC)) {
The documentation stated IMHO silly magic behavior of the old output layer.
Why start sprinkling the new code with useless magic meanings?
Hi Mike,
Fair point regarding bug 46903. In this case, I can see how
documenting a change in behaviour could be better than implementing
the currently documented behaviour - either approach is fine by me.
I'm happy to revert this and raise a doc bug instead, if that's the
right way to go.
Cheers,
Robin
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
