[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Feb 14 01:32:32 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3317r2=1.3318diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3317 php-src/ChangeLog:1.3318 --- php-src/ChangeLog:1.3317Fri Feb 13 01:33:00 2009 +++ php-src/ChangeLog Sat Feb 14 01:32:31 2009 @@ -1,3 +1,95 @@ +2009-02-13 Andrei Zmievski and...@gravitonic.com + +* (PHP_5_2) + NEWS + ext/standard/array.c + ext/standard/array.c + ext/standard/array.c: + Revert bogus fix for #47370. + +2009-02-13 Zoe Slattery zoe.slatt...@googlemail.com + +* (PHP_5_3) + ext/standard/tests/array/array_map_variation4.phpt: + remove UEXPECT + +* ext/dom/tests/DOMDocument_savexml_basic.phpt + ext/dom/tests/DOMDocument_savexml_basic.phpt: + fixed bad section name + +* (PHP_5_3) + ext/dom/tests/dom_xinclude.phpt: + fixed test + +2009-02-13 Kalle Sommer Nielsen kalle@gmail.com + +* php.ini-dist + php.ini-recommended: + Revert previous change + +2009-02-13 Takeshi Abe t...@fixedpoint.jp + +* ext/gd/libgd/gdparttopng.c + ext/gd/libgd/gdtopng.c: + fixed typos + +2009-02-13 Felipe Pena felipe...@gmail.com + +* (PHP_5_3) + ext/pdo/pdo_dbh.c: + - Added missing void param check and arginfo + +* ext/pdo/pdo_dbh.c: + - Added arginfo + +2009-02-13 David Coallier david.coall...@gmail.com + +* (PHP_5_3) + NEWS: + - Good bug # order. + +* (PHP_5_3) + NEWS: + - Fixed bug #46897: (ob_flush() should fail to flush unerasable buffers) + +* (PHP_5_3) + main/output.c + tests/output/bug46897.phpt + tests/output/bug46897.phpt: + - Fixed bug #46897: ob_flush() should fail to flush unerasable buffers + - Added test for bug46897 + - A memleak has been identified while fixing this bug but the changes +made by this commit do not affect ob_get_clean where the memleak (which +is fixed in HEAD with the new handler) resides. + - [DOC] New noticed is outputted in ob_flush when the buffer is unerasable + +2009-02-13 Felipe Pena felipe...@gmail.com + +* (PHP_5_3) + NEWS: + BFN + +* (PHP_5_3) + ext/pdo_sqlite/tests/bug43831.phpt: + - New test + +* ext/pdo_sqlite/tests/bug43831.phpt + ext/pdo_sqlite/tests/bug43831.phpt: + + - New test + +* (PHP_5_3) + ext/pdo/pdo_dbh.c: + MFH: + - Fixed bug #43831 ($this gets mangled when extending PDO with persistent + connection) + - Fixed bug #45432 (PDO: persistent connection leak) + +* ext/pdo/pdo_dbh.c: + - Fixed bug #43831 ($this gets mangled when extending PDO with persistent + connection) + - Fixed bug #45432 (PDO: persistent connection leak) + 2009-02-12 Ilia Alshanetsky i...@prohost.org * (PHP_5_2) @@ -29842,7 +29934,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3317 2009/02/13 01:33:00 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3318 2009/02/14 01:32:31 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
felipe Fri Feb 13 11:22:00 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.490r2=1.2027.2.547.2.965.2.491diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.490 php-src/NEWS:1.2027.2.547.2.965.2.491 --- php-src/NEWS:1.2027.2.547.2.965.2.490 Mon Feb 9 15:03:32 2009 +++ php-src/NEWSFri Feb 13 11:21:59 2009 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2009, PHP 5.3.0 Beta 2 +?? ??? 2009, PHP 5.3.0 Beta 2 - 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) @@ -9,6 +9,9 @@ - Fixed bug #47031 (Fix constants in DualIterator example). (Etienne) - Fixed bug #46347 (parse_ini_file() doesn't support * in keys). (Nuno) - Fixed bug #46048 (SimpleXML top-level @attributes not part of iterator). (David C.) +- Fixed bug #45432 (PDO: persistent connection leak). (Felipe) +- Fixed bug #43831 ($this gets mangled when extending PDO with persistent + connection). (Felipe) 29 Jan 2009, PHP 5.3.0 Beta 1 - Upgraded bundled sqlite to version 3.6.10. (Scott, Ilia) -- 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) /main output.c /tests/output bug46897.phpt
davidc Fri Feb 13 11:48:17 2009 UTC Added files: (Branch: PHP_5_3) /php-src/tests/output bug46897.phpt Modified files: /php-src/main output.c Log: - Fixed bug #46897: ob_flush() should fail to flush unerasable buffers - Added test for bug46897 - A memleak has been identified while fixing this bug but the changes made by this commit do not affect ob_get_clean where the memleak (which is fixed in HEAD with the new handler) resides. - [DOC] New noticed is outputted in ob_flush when the buffer is unerasable http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.167.2.3.2.4.2.11r2=1.167.2.3.2.4.2.12diff_format=u Index: php-src/main/output.c diff -u php-src/main/output.c:1.167.2.3.2.4.2.11 php-src/main/output.c:1.167.2.3.2.4.2.12 --- php-src/main/output.c:1.167.2.3.2.4.2.11Wed Jan 7 18:34:18 2009 +++ php-src/main/output.c Fri Feb 13 11:48:17 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: output.c,v 1.167.2.3.2.4.2.11 2009/01/07 18:34:18 felipe Exp $ */ +/* $Id: output.c,v 1.167.2.3.2.4.2.12 2009/02/13 11:48:17 davidc Exp $ */ #include php.h #include ext/standard/head.h @@ -774,6 +774,11 @@ RETURN_FALSE; } + if (!OG(active_ob_buffer).status !OG(active_ob_buffer).erase) { + php_error_docref(ref.outcontrol TSRMLS_CC, E_NOTICE, failed to flush buffer %s., OG(active_ob_buffer).handler_name); + RETURN_FALSE; + } + php_end_ob_buffer(1, 1 TSRMLS_CC); RETURN_TRUE; } http://cvs.php.net/viewvc.cgi/php-src/tests/output/bug46897.phpt?view=markuprev=1.1 Index: php-src/tests/output/bug46897.phpt +++ php-src/tests/output/bug46897.phpt -- 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
davidc Fri Feb 13 11:54:06 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Fixed bug #46897: (ob_flush() should fail to flush unerasable buffers) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.491r2=1.2027.2.547.2.965.2.492diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.491 php-src/NEWS:1.2027.2.547.2.965.2.492 --- php-src/NEWS:1.2027.2.547.2.965.2.491 Fri Feb 13 11:21:59 2009 +++ php-src/NEWSFri Feb 13 11:54:05 2009 @@ -12,6 +12,7 @@ - Fixed bug #45432 (PDO: persistent connection leak). (Felipe) - Fixed bug #43831 ($this gets mangled when extending PDO with persistent connection). (Felipe) +- Fixed bug #46897 (ob_flush() should fail to flush unerasable buffers). (David C.) 29 Jan 2009, PHP 5.3.0 Beta 1 - Upgraded bundled sqlite to version 3.6.10. (Scott, Ilia) -- 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
davidc Fri Feb 13 12:21:07 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Good bug # order. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.492r2=1.2027.2.547.2.965.2.493diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.492 php-src/NEWS:1.2027.2.547.2.965.2.493 --- php-src/NEWS:1.2027.2.547.2.965.2.492 Fri Feb 13 11:54:05 2009 +++ php-src/NEWSFri Feb 13 12:21:06 2009 @@ -7,12 +7,12 @@ - Fixed bug #47229 (preg_quote() should escape the '-' char). (Nuno) - Fixed bug #47085 (rename() returns true even if the file in PHAR does not exist). (Greg) - Fixed bug #47031 (Fix constants in DualIterator example). (Etienne) +- Fixed bug #46897 (ob_flush() should fail to flush unerasable buffers). (David C.) - Fixed bug #46347 (parse_ini_file() doesn't support * in keys). (Nuno) - Fixed bug #46048 (SimpleXML top-level @attributes not part of iterator). (David C.) - Fixed bug #45432 (PDO: persistent connection leak). (Felipe) - Fixed bug #43831 ($this gets mangled when extending PDO with persistent connection). (Felipe) -- Fixed bug #46897 (ob_flush() should fail to flush unerasable buffers). (David C.) 29 Jan 2009, PHP 5.3.0 Beta 1 - Upgraded bundled sqlite to version 3.6.10. (Scott, Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c
felipe Fri Feb 13 12:54:20 2009 UTC Modified files: /php-src/ext/pdopdo_dbh.c Log: - Added arginfo http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.160r2=1.161diff_format=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.160 php-src/ext/pdo/pdo_dbh.c:1.161 --- php-src/ext/pdo/pdo_dbh.c:1.160 Fri Feb 13 02:18:04 2009 +++ php-src/ext/pdo/pdo_dbh.c Fri Feb 13 12:54:20 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo_dbh.c,v 1.160 2009/02/13 02:18:04 felipe Exp $ */ +/* $Id: pdo_dbh.c,v 1.161 2009/02/13 12:54:20 felipe Exp $ */ /* The PDO Database Handle Class */ @@ -610,6 +610,9 @@ { pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC); + if (zend_parse_parameters_none() == FAILURE) { + return; + } PDO_CONSTRUCT_CHECK; if (dbh-in_txn) { @@ -640,6 +643,9 @@ { pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC); + if (zend_parse_parameters_none() == FAILURE) { + return; + } PDO_CONSTRUCT_CHECK; if (!dbh-in_txn) { @@ -663,6 +669,9 @@ { pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC); + if (zend_parse_parameters_none() == FAILURE) { + return; + } PDO_CONSTRUCT_CHECK; if (!dbh-in_txn) { @@ -1191,23 +1200,62 @@ } /* }}} */ +/* {{{ arginfo */ +ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo___construct, 0, 0, 3) + ZEND_ARG_INFO(0, dsn) + ZEND_ARG_INFO(0, username) + ZEND_ARG_INFO(0, passwd) + ZEND_ARG_INFO(0, options) /* array */ +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo_prepare, 0, 0, 1) + ZEND_ARG_INFO(0, statment) + ZEND_ARG_INFO(0, options) /* array */ +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO(arginfo_pdo_setattribute, 0) + ZEND_ARG_INFO(0, attribute) + ZEND_ARG_INFO(0, value) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO(arginfo_pdo_getattribute, 0) + ZEND_ARG_INFO(0, attribute) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO(arginfo_pdo_exec, 0) + ZEND_ARG_INFO(0, query) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo_lastinsertid, 0, 0, 0) + ZEND_ARG_INFO(0, seqname) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo_quote, 0, 0, 1) + ZEND_ARG_INFO(0, string) + ZEND_ARG_INFO(0, paramtype) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO(arginfo_pdo__void, 0) +ZEND_END_ARG_INFO() +/* }}} */ + const zend_function_entry pdo_dbh_functions[] = { - ZEND_MALIAS(PDO, __construct, dbh_constructor, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, prepare,NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, beginTransaction, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, commit, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, rollBack, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, setAttribute, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, exec, NULL, ZEND_ACC_PUBLIC) + ZEND_MALIAS(PDO, __construct, dbh_constructor, arginfo_pdo___construct,ZEND_ACC_PUBLIC) + PHP_ME(PDO, prepare,arginfo_pdo_prepare, ZEND_ACC_PUBLIC) + PHP_ME(PDO, beginTransaction, arginfo_pdo__void, ZEND_ACC_PUBLIC) + PHP_ME(PDO, commit, arginfo_pdo__void, ZEND_ACC_PUBLIC) + PHP_ME(PDO, rollBack, arginfo_pdo__void, ZEND_ACC_PUBLIC) + PHP_ME(PDO, setAttribute, arginfo_pdo_setattribute, ZEND_ACC_PUBLIC) + PHP_ME(PDO, exec, arginfo_pdo_exec, ZEND_ACC_PUBLIC) PHP_ME(PDO, query, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, lastInsertId, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, errorCode, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, errorInfo, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, getAttribute, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, quote, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, __wakeup, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) - PHP_ME(PDO, __sleep,NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) - PHP_ME(PDO, getAvailableDrivers, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) + PHP_ME(PDO, lastInsertId, arginfo_pdo_lastinsertid,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_dbh.c
felipe Fri Feb 13 12:55:38 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdopdo_dbh.c Log: - Added missing void param check and arginfo http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.20r2=1.82.2.31.2.17.2.21diff_format=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.20 php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.21 --- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.20 Fri Feb 13 02:18:57 2009 +++ php-src/ext/pdo/pdo_dbh.c Fri Feb 13 12:55:38 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.20 2009/02/13 02:18:57 felipe Exp $ */ +/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.21 2009/02/13 12:55:38 felipe Exp $ */ /* The PDO Database Handle Class */ @@ -604,6 +604,9 @@ { pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC); + if (zend_parse_parameters_none() == FAILURE) { + return; + } PDO_CONSTRUCT_CHECK; if (dbh-in_txn) { @@ -634,6 +637,9 @@ { pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC); + if (zend_parse_parameters_none() == FAILURE) { + return; + } PDO_CONSTRUCT_CHECK; if (!dbh-in_txn) { @@ -657,6 +663,9 @@ { pdo_dbh_t *dbh = zend_object_store_get_object(getThis() TSRMLS_CC); + if (zend_parse_parameters_none() == FAILURE) { + return; + } PDO_CONSTRUCT_CHECK; if (!dbh-in_txn) { @@ -1193,46 +1202,55 @@ ZEND_ARG_INFO(0, passwd) ZEND_ARG_INFO(0, options) /* array */ ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo_prepare, 0, 0, 1) ZEND_ARG_INFO(0, statment) ZEND_ARG_INFO(0, options) /* array */ ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO(arginfo_pdo_setattribute, 0) ZEND_ARG_INFO(0, attribute) ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO(arginfo_pdo_getattribute, 0) ZEND_ARG_INFO(0, attribute) ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO(arginfo_pdo_exec, 0) ZEND_ARG_INFO(0, query) ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo_lastinsertid, 0, 0, 0) ZEND_ARG_INFO(0, seqname) ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_pdo_quote, 0, 0, 1) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, paramtype) ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO(arginfo_pdo__void, 0) +ZEND_END_ARG_INFO() /* }}} */ const zend_function_entry pdo_dbh_functions[] = { ZEND_MALIAS(PDO, __construct, dbh_constructor, arginfo_pdo___construct,ZEND_ACC_PUBLIC) PHP_ME(PDO, prepare,arginfo_pdo_prepare, ZEND_ACC_PUBLIC) - PHP_ME(PDO, beginTransaction, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, commit, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, rollBack, NULL, ZEND_ACC_PUBLIC) + PHP_ME(PDO, beginTransaction, arginfo_pdo__void, ZEND_ACC_PUBLIC) + PHP_ME(PDO, commit, arginfo_pdo__void, ZEND_ACC_PUBLIC) + PHP_ME(PDO, rollBack, arginfo_pdo__void, ZEND_ACC_PUBLIC) PHP_ME(PDO, setAttribute, arginfo_pdo_setattribute, ZEND_ACC_PUBLIC) PHP_ME(PDO, exec, arginfo_pdo_exec, ZEND_ACC_PUBLIC) PHP_ME(PDO, query, NULL, ZEND_ACC_PUBLIC) PHP_ME(PDO, lastInsertId, arginfo_pdo_lastinsertid, ZEND_ACC_PUBLIC) - PHP_ME(PDO, errorCode, NULL, ZEND_ACC_PUBLIC) - PHP_ME(PDO, errorInfo, NULL, ZEND_ACC_PUBLIC) + PHP_ME(PDO, errorCode, arginfo_pdo__void, ZEND_ACC_PUBLIC) + PHP_ME(PDO, errorInfo, arginfo_pdo__void, ZEND_ACC_PUBLIC) PHP_ME(PDO, getAttribute, arginfo_pdo_getattribute, ZEND_ACC_PUBLIC) PHP_ME(PDO, quote, arginfo_pdo_quote, ZEND_ACC_PUBLIC) - PHP_ME(PDO, __wakeup, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) - PHP_ME(PDO, __sleep,NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) - PHP_ME(PDO, getAvailableDrivers, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) + PHP_ME(PDO, __wakeup, arginfo_pdo__void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) + PHP_ME(PDO, __sleep,arginfo_pdo__void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) + PHP_ME(PDO, getAvailableDrivers,arginfo_pdo__void, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
[PHP-CVS] cvs: php-src /ext/gd/libgd gdparttopng.c gdtopng.c
tabeFri Feb 13 16:02:46 2009 UTC Modified files: /php-src/ext/gd/libgd gdparttopng.c gdtopng.c Log: fixed typos http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdparttopng.c?r1=1.2r2=1.3diff_format=u Index: php-src/ext/gd/libgd/gdparttopng.c diff -u php-src/ext/gd/libgd/gdparttopng.c:1.2 php-src/ext/gd/libgd/gdparttopng.c:1.3 --- php-src/ext/gd/libgd/gdparttopng.c:1.2 Tue Oct 29 23:08:01 2002 +++ php-src/ext/gd/libgd/gdparttopng.c Fri Feb 13 16:02:46 2009 @@ -37,7 +37,7 @@ fclose (in); if (!im) { - fprintf (stderr, Input is not in PNG format!\n); + fprintf (stderr, Input is not in GD2 format!\n); exit (1); } out = fopen (argv[2], wb); http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdtopng.c?r1=1.1r2=1.2diff_format=u Index: php-src/ext/gd/libgd/gdtopng.c diff -u php-src/ext/gd/libgd/gdtopng.c:1.1 php-src/ext/gd/libgd/gdtopng.c:1.2 --- php-src/ext/gd/libgd/gdtopng.c:1.1 Sat Apr 13 02:03:09 2002 +++ php-src/ext/gd/libgd/gdtopng.c Fri Feb 13 16:02:46 2009 @@ -26,7 +26,7 @@ fclose (in); if (!im) { - fprintf (stderr, Input is not in PNG format!\n); + fprintf (stderr, Input is not in GD format!\n); exit (1); } out = fopen (argv[2], wb); -- 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/gd/libgd gdparttopng.c gdtopng.c
tabeFri Feb 13 16:03:02 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd/libgd gdparttopng.c gdtopng.c Log: MFH: fixed typos http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdparttopng.c?r1=1.2r2=1.2.22.1diff_format=u Index: php-src/ext/gd/libgd/gdparttopng.c diff -u php-src/ext/gd/libgd/gdparttopng.c:1.2 php-src/ext/gd/libgd/gdparttopng.c:1.2.22.1 --- php-src/ext/gd/libgd/gdparttopng.c:1.2 Tue Oct 29 23:08:01 2002 +++ php-src/ext/gd/libgd/gdparttopng.c Fri Feb 13 16:03:02 2009 @@ -37,7 +37,7 @@ fclose (in); if (!im) { - fprintf (stderr, Input is not in PNG format!\n); + fprintf (stderr, Input is not in GD2 format!\n); exit (1); } out = fopen (argv[2], wb); http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gdtopng.c?r1=1.1r2=1.1.24.1diff_format=u Index: php-src/ext/gd/libgd/gdtopng.c diff -u php-src/ext/gd/libgd/gdtopng.c:1.1 php-src/ext/gd/libgd/gdtopng.c:1.1.24.1 --- php-src/ext/gd/libgd/gdtopng.c:1.1 Sat Apr 13 02:03:09 2002 +++ php-src/ext/gd/libgd/gdtopng.c Fri Feb 13 16:03:02 2009 @@ -26,7 +26,7 @@ fclose (in); if (!im) { - fprintf (stderr, Input is not in PNG format!\n); + fprintf (stderr, Input is not in GD format!\n); exit (1); } out = fopen (argv[2], wb); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
kalle Fri Feb 13 16:54:16 2009 UTC Modified files: /php-srcphp.ini-dist php.ini-recommended Log: Revert previous change http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.289r2=1.290diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.289 php-src/php.ini-dist:1.290 --- php-src/php.ini-dist:1.289 Thu Feb 12 14:36:32 2009 +++ php-src/php.ini-distFri Feb 13 16:54:16 2009 @@ -251,11 +251,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL | ~E_NOTICE | ~E_STRICT +;error_reporting = E_ALL ~E_NOTICE ~E_STRICT ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL | ~E_NOTICE +;error_reporting = E_ALL ~E_NOTICE ; ; - Show only errors ; @@ -263,7 +263,7 @@ ; ; - Show all errors, except coding standards warnings ; -error_reporting = E_ALL | ~E_STRICT +error_reporting = E_ALL ~E_STRICT ; Print out errors (as a part of the output). For production web sites, ; you're strongly encouraged to turn this feature off, and use error logging http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.239r2=1.240diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.239 php-src/php.ini-recommended:1.240 --- php-src/php.ini-recommended:1.239 Thu Feb 12 14:36:32 2009 +++ php-src/php.ini-recommended Fri Feb 13 16:54:16 2009 @@ -288,11 +288,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL | ~E_NOTICE | ~E_STRICT +;error_reporting = E_ALL ~E_NOTICE ~E_STRICT ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL | ~E_NOTICE +;error_reporting = E_ALL ~E_NOTICE ; ; - Show only errors ; @@ -300,7 +300,7 @@ ; ; - Show all errors, except coding standards warnings ; -error_reporting = E_ALL | ~E_STRICT +error_reporting = E_ALL ~E_STRICT ; Print out errors (as a part of the output). For production web sites, ; you're strongly encouraged to turn this feature off, and use error logging -- 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) / php.ini-dist php.ini-recommended
kalle Fri Feb 13 16:54:56 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-dist php.ini-recommended Log: MFH: Revert previous change http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.22.2.19r2=1.231.2.10.2.22.2.20diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.22.2.19 php-src/php.ini-dist:1.231.2.10.2.22.2.20 --- php-src/php.ini-dist:1.231.2.10.2.22.2.19 Thu Feb 12 14:36:58 2009 +++ php-src/php.ini-distFri Feb 13 16:54:56 2009 @@ -301,11 +301,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL | ~E_NOTICE +;error_reporting = E_ALL ~E_NOTICE ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL | ~E_NOTICE | E_STRICT +;error_reporting = E_ALL ~E_NOTICE | E_STRICT ; ; - Show only errors ; @@ -313,7 +313,7 @@ ; ; - Show all errors except for notices and coding standards warnings ; -error_reporting = E_ALL | ~E_NOTICE +error_reporting = E_ALL ~E_NOTICE ; Print out errors (as a part of the output). For production web sites, ; you're strongly encouraged to turn this feature off, and use error logging http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.23.2.20r2=1.179.2.11.2.23.2.21diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.23.2.20 php-src/php.ini-recommended:1.179.2.11.2.23.2.21 --- php-src/php.ini-recommended:1.179.2.11.2.23.2.20Thu Feb 12 14:36:58 2009 +++ php-src/php.ini-recommended Fri Feb 13 16:54:56 2009 @@ -351,11 +351,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL | ~E_NOTICE +;error_reporting = E_ALL ~E_NOTICE ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL | ~E_NOTICE | E_STRICT +;error_reporting = E_ALL ~E_NOTICE | E_STRICT ; ; - Show only errors ; @@ -363,7 +363,7 @@ ; ; - Show all errors, except coding standards warnings ; -error_reporting = E_ALL +error_reporting = E_ALL ; Print out errors (as a part of the output). For production web sites, ; you're strongly encouraged to turn this feature off, and use error logging -- 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) / php.ini-dist php.ini-recommended
kalle Fri Feb 13 16:55:18 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: MFH: Revert previous change http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.27r2=1.231.2.10.2.28diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.27 php-src/php.ini-dist:1.231.2.10.2.28 --- php-src/php.ini-dist:1.231.2.10.2.27Thu Feb 12 14:37:27 2009 +++ php-src/php.ini-distFri Feb 13 16:55:18 2009 @@ -290,11 +290,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL | ~E_NOTICE +;error_reporting = E_ALL ~E_NOTICE ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL | ~E_NOTICE | E_STRICT +;error_reporting = E_ALL ~E_NOTICE | E_STRICT ; ; - Show only errors ; @@ -302,7 +302,7 @@ ; ; - Show all errors except for notices and coding standards warnings ; -error_reporting = E_ALL | ~E_NOTICE +error_reporting = E_ALL ~E_NOTICE ; Print out errors (as a part of the output). For production web sites, ; you're strongly encouraged to turn this feature off, and use error logging http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.29r2=1.179.2.11.2.30diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.29 php-src/php.ini-recommended:1.179.2.11.2.30 --- php-src/php.ini-recommended:1.179.2.11.2.29 Thu Feb 12 14:37:27 2009 +++ php-src/php.ini-recommended Fri Feb 13 16:55:18 2009 @@ -339,11 +339,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL | ~E_NOTICE +;error_reporting = E_ALL ~E_NOTICE ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL | ~E_NOTICE | E_STRICT +;error_reporting = E_ALL ~E_NOTICE | E_STRICT ; ; - Show only errors ; @@ -351,7 +351,7 @@ ; ; - Show all errors, except coding standards warnings ; -error_reporting = E_ALL +error_reporting = E_ALL ; Print out errors (as a part of the output). For production web sites, ; you're strongly encouraged to turn this feature off, and use error logging -- 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/dom/tests dom_xinclude.phpt
zoe Fri Feb 13 17:56:20 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/dom/tests dom_xinclude.phpt Log: fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom_xinclude.phpt?r1=1.4.2.1r2=1.4.2.1.4.1diff_format=u Index: php-src/ext/dom/tests/dom_xinclude.phpt diff -u php-src/ext/dom/tests/dom_xinclude.phpt:1.4.2.1 php-src/ext/dom/tests/dom_xinclude.phpt:1.4.2.1.4.1 --- php-src/ext/dom/tests/dom_xinclude.phpt:1.4.2.1 Thu Oct 20 19:22:03 2005 +++ php-src/ext/dom/tests/dom_xinclude.phpt Fri Feb 13 17:56:20 2009 @@ -23,10 +23,10 @@ --EXPECTF-- ?xml version=1.0? foo xmlns:xi=http://www.w3.org/2001/XInclude; -book xml:base=compress.zlib://%sext/dom/tests/book.xml +book xml:base=compress.zlib://%sbook.xml titleThe Grapes of Wrath/title authorJohn Steinbeck/author - /bookbook xml:base=compress.zlib://%sext/dom/tests/book.xml + /bookbook xml:base=compress.zlib://%sbook.xml titleThe Pearl/title authorJohn Steinbeck/author /book -- 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/dom/tests DOMDocument_savexml_basic.phpt
zoe Fri Feb 13 18:01:27 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/dom/tests DOMDocument_savexml_basic.phpt Log: fixed bad section name http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt diff -u php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt:1.1.2.2 php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt:1.1.2.3 --- php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt:1.1.2.2Tue May 27 10:21:21 2008 +++ php-src/ext/dom/tests/DOMDocument_savexml_basic.phptFri Feb 13 18:01:27 2009 @@ -1,6 +1,6 @@ --TEST-- DOM Document : save and saveXML ---CREDIT-- +--CREDITS-- Sami Greenbury (s...@patabugen.co.uk) # TestFest 2008 --SKIPIF-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests DOMDocument_savexml_basic.phpt
zoe Fri Feb 13 18:02:03 2009 UTC Modified files: /php-src/ext/dom/tests DOMDocument_savexml_basic.phpt Log: fixed bad section name http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt diff -u php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt:1.2 php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt:1.3 --- php-src/ext/dom/tests/DOMDocument_savexml_basic.phpt:1.2Tue May 27 18:16:00 2008 +++ php-src/ext/dom/tests/DOMDocument_savexml_basic.phptFri Feb 13 18:02:03 2009 @@ -1,6 +1,6 @@ --TEST-- DOM Document : save and saveXML ---CREDIT-- +--CREDITS-- Sami Greenbury (s...@patabugen.co.uk) # TestFest 2008 --SKIPIF-- -- 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/array array_map_variation4.phpt
zoe Fri Feb 13 22:01:28 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array array_map_variation4.phpt Log: remove UEXPECT http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_map_variation4.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/array/array_map_variation4.phpt diff -u php-src/ext/standard/tests/array/array_map_variation4.phpt:1.1.2.2 php-src/ext/standard/tests/array/array_map_variation4.phpt:1.1.2.3 --- php-src/ext/standard/tests/array/array_map_variation4.phpt:1.1.2.2 Thu Jan 3 09:43:45 2008 +++ php-src/ext/standard/tests/array/array_map_variation4.phpt Fri Feb 13 22:01:28 2009 @@ -177,104 +177,3 @@ string(7) heredoc } Done ---UEXPECTF-- -*** Testing array_map() : associative array with diff. keys for 'arr1' argument *** - -Warning: Illegal offset type in %s on line %d - -Warning: Illegal offset type in %s on line %d - -Warning: Illegal offset type in %s on line %d - -Warning: Illegal offset type in %s on line %d --- Iteration 1 -- -array(0) { -} --- Iteration 2 -- -array(1) { - [0]= - unicode(1) 0 -} --- Iteration 3 -- -array(1) { - [1]= - unicode(1) 1 -} --- Iteration 4 -- -array(4) { - [1]= - unicode(1) 1 - [2]= - unicode(1) 2 - [3]= - unicode(1) 3 - [4]= - unicode(1) 4 -} --- Iteration 5 -- -array(1) { - [2]= - unicode(5) float -} --- Iteration 6 -- -array(4) { - [1]= - unicode(2) f1 - [3]= - unicode(2) f2 - [4]= - unicode(2) f3 - []= - unicode(2) f4 -} --- Iteration 7 -- -array(4) { - [u\tHello]= - int(111) - [ure\td]= - unicode(5) color - [u\v\fworld]= - float(2.2) - [upen\n]= - int(33) -} --- Iteration 8 -- -array(4) { - [u Hello]= - int(111) - [ured]= - unicode(5) color - [uworld]= - float(2.2) - [upen -]= - int(33) -} --- Iteration 9 -- -array(2) { - [0]= - unicode(5) hello - [uHello world]= - unicode(6) string -} --- Iteration 10 -- -array(1) { - [u]= - unicode(5) hello -} --- Iteration 11 -- -array(6) { - [uhello]= - int(1) - [ufruit]= - float(2.2) - [133]= - unicode(3) int - [444]= - unicode(5) float - [u]= - unicode(5) unset - [uHello world]= - unicode(7) heredoc -} -Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard array.c
Don't do this please. Why did you feel the need to go back and change my patch including the NEWS entry? I knew what I was doing when I set the default behavior to SORT_REGULAR and this was discussed with both 5.3 and 5.2 RMs. With your change it'l back to the stupid old behavior of: $array = array(new stdClass(), new stdClass(), new Foo()); $array = array_unique($array); And now $array has only 1 element. I really hate having tell PHP not to be stupid, rather than having it default to being smart. I'm going to revert this. -Andrei Moriyoshi Koizumi wrote: moriyoshi Thu Feb 12 18:29:15 2009 UTC Modified files: /php-src/ext/standard array.c Log: * Fix bug #47370 (BC breakage of array_unique()) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.471r2=1.472diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.471 php-src/ext/standard/array.c:1.472 --- php-src/ext/standard/array.c:1.471 Mon Feb 9 10:47:19 2009 +++ php-src/ext/standard/array.cThu Feb 12 18:29:15 2009 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: array.c,v 1.471 2009/02/09 10:47:19 dmitry Exp $ */ +/* $Id: array.c,v 1.472 2009/02/12 18:29:15 moriyoshi Exp $ */ #include php.h #include php_ini.h @@ -2924,7 +2924,7 @@ }; struct bucketindex *arTmp, *cmpdata, *lastkept; unsigned int i; - long sort_type = PHP_SORT_REGULAR; + long sort_type = PHP_SORT_STRING; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, a|l, array, sort_type) == FAILURE) { return; -- 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/standard array.c
andrei Fri Feb 13 22:26:47 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard array.c /php-srcNEWS Log: Revert bogus fix for #47370. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.64r2=1.308.2.21.2.65diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.308.2.21.2.64 php-src/ext/standard/array.c:1.308.2.21.2.65 --- php-src/ext/standard/array.c:1.308.2.21.2.64Thu Feb 12 18:30:31 2009 +++ php-src/ext/standard/array.cFri Feb 13 22:26:46 2009 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: array.c,v 1.308.2.21.2.64 2009/02/12 18:30:31 moriyoshi Exp $ */ +/* $Id: array.c,v 1.308.2.21.2.65 2009/02/13 22:26:46 andrei Exp $ */ #include php.h #include php_ini.h @@ -2839,7 +2839,7 @@ }; struct bucketindex *arTmp, *cmpdata, *lastkept; unsigned int i; - long sort_type = SORT_STRING; + long sort_type = SORT_REGULAR; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Z|l, array, sort_type) == FAILURE) { return; http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1416r2=1.2027.2.547.2.1417diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1416 php-src/NEWS:1.2027.2.547.2.1417 --- php-src/NEWS:1.2027.2.547.2.1416Thu Feb 12 20:32:17 2009 +++ php-src/NEWSFri Feb 13 22:26:46 2009 @@ -14,7 +14,7 @@ properties and __get(). (Andrei) - Added optional sorting type flag parameter to array_unique(). Default is - SORT_STRING. (Andrei) + SORT_REGULAR. (Andrei) - Fixed a crash on extract in zip when files or directories entry names contain a relative path. (Pierre) -- 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 array.c
andrei Fri Feb 13 22:34:15 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard array.c Log: Revert bogus fix for #47370. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.52r2=1.308.2.21.2.37.2.53diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.52 php-src/ext/standard/array.c:1.308.2.21.2.37.2.53 --- php-src/ext/standard/array.c:1.308.2.21.2.37.2.52 Thu Feb 12 18:57:55 2009 +++ php-src/ext/standard/array.cFri Feb 13 22:34:15 2009 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: array.c,v 1.308.2.21.2.37.2.52 2009/02/12 18:57:55 moriyoshi Exp $ */ +/* $Id: array.c,v 1.308.2.21.2.37.2.53 2009/02/13 22:34:15 andrei Exp $ */ #include php.h #include php_ini.h @@ -2697,7 +2697,7 @@ }; struct bucketindex *arTmp, *cmpdata, *lastkept; unsigned int i; - long sort_type = PHP_SORT_STRING; + long sort_type = PHP_SORT_REGULAR; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, a|l, array, sort_type) == FAILURE) { return; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard array.c
andrei Fri Feb 13 22:35:18 2009 UTC Modified files: /php-src/ext/standard array.c Log: Revert bogus fix for #47370. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.472r2=1.473diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.472 php-src/ext/standard/array.c:1.473 --- php-src/ext/standard/array.c:1.472 Thu Feb 12 18:29:15 2009 +++ php-src/ext/standard/array.cFri Feb 13 22:35:18 2009 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: array.c,v 1.472 2009/02/12 18:29:15 moriyoshi Exp $ */ +/* $Id: array.c,v 1.473 2009/02/13 22:35:18 andrei Exp $ */ #include php.h #include php_ini.h @@ -2924,7 +2924,7 @@ }; struct bucketindex *arTmp, *cmpdata, *lastkept; unsigned int i; - long sort_type = PHP_SORT_STRING; + long sort_type = PHP_SORT_REGULAR; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, a|l, array, sort_type) == FAILURE) { return; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
moriyoshi Sat Feb 14 06:59:36 2009 UTC Modified files: /php-src/ext/standard string.c Log: - These should be E_WARNING for consistency with strpos() http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.691r2=1.692diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.691 php-src/ext/standard/string.c:1.692 --- php-src/ext/standard/string.c:1.691 Sat Jan 17 20:36:22 2009 +++ php-src/ext/standard/string.c Sat Feb 14 06:59:36 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: string.c,v 1.691 2009/01/17 20:36:22 felipe Exp $ */ +/* $Id: string.c,v 1.692 2009/02/14 06:59:36 moriyoshi Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -2784,7 +2784,7 @@ if (offset = 0) { U16_FWD_N(haystack.u, cu_offset, haystack_len, offset); if (cu_offset haystack_len - needle_len) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } u_p = haystack.u + cu_offset; @@ -2792,13 +2792,13 @@ } else { u_p = haystack.u; if (-offset haystack_len || offset -INT_MAX) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } else { cu_offset = haystack_len; U16_BACK_N(haystack.u, 0, cu_offset, -offset); if (cu_offset == 0) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } if (needle_len haystack_len - cu_offset) { @@ -2822,14 +2822,14 @@ } else { if (offset = 0) { if (offset haystack_len) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } p = haystack.s + offset; e = haystack.s + haystack_len - needle_len; } else { if (-offset haystack_len || offset -INT_MAX) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } @@ -2914,7 +2914,7 @@ if (offset = 0) { U16_FWD_N(haystack.u, cu_offset, haystack_len, offset); if (cu_offset haystack_len) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } u_p = haystack.u + cu_offset; @@ -2922,13 +2922,13 @@ } else { u_p = haystack.u; if (-offset haystack_len || offset -INT_MAX) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } else { cu_offset = haystack_len; U16_BACK_N(haystack.u, 0, cu_offset, -offset); if (cu_offset == 0) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); +
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c
moriyoshi Sat Feb 14 06:59:56 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard string.c Log: - MFH: These should be E_WARNING for consistency with strpos() http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.41r2=1.445.2.14.2.69.2.42diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.41 php-src/ext/standard/string.c:1.445.2.14.2.69.2.42 --- php-src/ext/standard/string.c:1.445.2.14.2.69.2.41 Fri Jan 30 00:16:27 2009 +++ php-src/ext/standard/string.c Sat Feb 14 06:59:55 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: string.c,v 1.445.2.14.2.69.2.41 2009/01/30 00:16:27 iliaa Exp $ */ +/* $Id: string.c,v 1.445.2.14.2.69.2.42 2009/02/14 06:59:55 moriyoshi Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -1833,14 +1833,14 @@ if (offset = 0) { if (offset haystack_len) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } p = haystack + offset; e = haystack + haystack_len - needle_len; } else { if (-offset haystack_len || offset -INT_MAX) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } @@ -1909,7 +1909,7 @@ Can also avoid tolower emallocs */ if (offset = 0) { if (offset haystack_len) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } p = haystack + offset; @@ -1917,7 +1917,7 @@ } else { p = haystack; if (-offset haystack_len || offset -INT_MAX) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } e = haystack + haystack_len + offset; @@ -1942,7 +1942,7 @@ if (offset haystack_len) { efree(needle_dup); efree(haystack_dup); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } p = haystack_dup + offset; @@ -1951,7 +1951,7 @@ if (-offset haystack_len || offset -INT_MAX) { efree(needle_dup); efree(haystack_dup); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } p = haystack_dup; -- 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/standard string.c
moriyoshi Sat Feb 14 07:00:24 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard string.c Log: - MFH: these should be E_WARNING for consistency with strpos() http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.80r2=1.445.2.14.2.81diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.445.2.14.2.80 php-src/ext/standard/string.c:1.445.2.14.2.81 --- php-src/ext/standard/string.c:1.445.2.14.2.80 Fri Jan 30 00:17:05 2009 +++ php-src/ext/standard/string.c Sat Feb 14 07:00:24 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: string.c,v 1.445.2.14.2.80 2009/01/30 00:17:05 iliaa Exp $ */ +/* $Id: string.c,v 1.445.2.14.2.81 2009/02/14 07:00:24 moriyoshi Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -1949,14 +1949,14 @@ if (offset = 0) { if (offset haystack_len) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } p = haystack + offset; e = haystack + haystack_len - needle_len; } else { if (-offset haystack_len) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } @@ -2025,7 +2025,7 @@ Can also avoid tolower emallocs */ if (offset = 0) { if (offset haystack_len) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } p = haystack + offset; @@ -2033,7 +2033,7 @@ } else { p = haystack; if (-offset haystack_len || offset -INT_MAX) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } e = haystack + haystack_len + offset; @@ -2058,7 +2058,7 @@ if (offset haystack_len) { efree(needle_dup); efree(haystack_dup); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } p = haystack_dup + offset; @@ -2067,7 +2067,7 @@ if (-offset haystack_len || offset -INT_MAX) { efree(needle_dup); efree(haystack_dup); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); RETURN_FALSE; } p = haystack_dup; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c mbstring.h /ext/mbstring/libmbfl/mbfl mbfilter.c /ext/mbstring/tests bug45923.phpt
moriyoshi Sat Feb 14 07:33:41 2009 UTC Added files: /php-src/ext/mbstring/tests bug45923.phpt Modified files: /php-src/ext/mbstring mbstring.c mbstring.h /php-src/ext/mbstring/libmbfl/mbfl mbfilter.c Log: - Fix Bug #45923 (mb_st[r]ripos() offset not handled correctly) # test still fails because of the difference of str[r]pos() behavior between 5.3 and 6.0. http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.314r2=1.315diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.314 php-src/ext/mbstring/mbstring.c:1.315 --- php-src/ext/mbstring/mbstring.c:1.314 Wed Feb 11 14:26:53 2009 +++ php-src/ext/mbstring/mbstring.c Sat Feb 14 07:33:41 2009 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mbstring.c,v 1.314 2009/02/11 14:26:53 iliaa Exp $ */ +/* $Id: mbstring.c,v 1.315 2009/02/14 07:33:41 moriyoshi Exp $ */ /* * PHP 4 Multibyte String module mbstring @@ -2075,8 +2075,8 @@ } } - if (offset 0 || (unsigned long)offset haystack.len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset not contained in string.); + if (offset 0 || offset mbfl_strlen(haystack)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset not contained in string); RETURN_FALSE; } if (needle.len == 0) { @@ -2092,17 +2092,17 @@ case 1: break; case 2: - php_error_docref(NULL TSRMLS_CC, E_WARNING, Needle has not positive length.); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Needle has not positive length); break; case 4: - php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown encoding or conversion error.); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown encoding or conversion error); break; case 8: - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Argument is empty.); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, Argument is empty); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown error in mb_strpos.); - break; + php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown error in mb_strpos); + break; } RETVAL_FALSE; } @@ -2188,6 +2188,16 @@ if (needle.len = 0) { RETURN_FALSE; } + + { + int haystack_char_len = mbfl_strlen(haystack); + if ((offset 0 offset haystack_char_len) || + (offset 0 -offset haystack_char_len)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); + RETURN_FALSE; + } + } + n = mbfl_strpos(haystack, needle, offset, 1); if (n = 0) { RETVAL_LONG(n); @@ -2242,10 +2252,6 @@ RETURN_FALSE; } - if ((unsigned int)offset haystack.len) { - RETURN_FALSE; - } - n = php_mb_stripos(1, (char *)haystack.val, haystack.len, (char *)needle.val, needle.len, offset, from_encoding TSRMLS_CC); if (n = 0) { @@ -4636,7 +4642,7 @@ /* {{{ MBSTRING_API int php_mb_stripos() */ -MBSTRING_API int php_mb_stripos(int mode, const char *old_haystack, unsigned int old_haystack_len, const char *old_needle, unsigned int old_needle_len, unsigned int offset, const char *from_encoding TSRMLS_DC) +MBSTRING_API int php_mb_stripos(int mode, const char *old_haystack, unsigned int old_haystack_len, const char *old_needle, unsigned int old_needle_len, long offset, const char *from_encoding TSRMLS_DC) { int n; mbfl_string haystack, needle; @@ -4679,9 +4685,21 @@ break; } - if (offset 0 || offset haystack.len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset not contained in string.); - break; + { + int haystack_char_len = mbfl_strlen(haystack); + + if (mode) { + if ((offset 0 offset haystack_char_len) || + (offset 0 -offset haystack_char_len)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); + break; + } + } else { +
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c mbstring.h /ext/mbstring/libmbfl/mbfl mbfilter.c /ext/mbstring/tests bug45923.phpt
moriyoshi Sat Feb 14 07:34:16 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/mbstring/tests bug45923.phpt Modified files: /php-src/ext/mbstring mbstring.c mbstring.h /php-src/ext/mbstring/libmbfl/mbfl mbfilter.c Log: - MFH: fix Bug #45923 (mb_st[r]ripos() offset not handled correctly) http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.47r2=1.224.2.22.2.25.2.48diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.47 php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.48 --- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.47Wed Feb 11 14:26:24 2009 +++ php-src/ext/mbstring/mbstring.c Sat Feb 14 07:34:15 2009 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mbstring.c,v 1.224.2.22.2.25.2.47 2009/02/11 14:26:24 iliaa Exp $ */ +/* $Id: mbstring.c,v 1.224.2.22.2.25.2.48 2009/02/14 07:34:15 moriyoshi Exp $ */ /* * PHP 4 Multibyte String module mbstring @@ -2237,12 +2237,12 @@ } } - if (offset 0 || (unsigned long)offset (unsigned long)mbfl_strlen(haystack)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset not contained in string.); + if (offset 0 || offset mbfl_strlen(haystack)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset not contained in string); RETURN_FALSE; } if (needle.len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, Empty delimiter.); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Empty delimiter); RETURN_FALSE; } @@ -2254,17 +2254,17 @@ case 1: break; case 2: - php_error_docref(NULL TSRMLS_CC, E_WARNING, Needle has not positive length.); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Needle has not positive length); break; case 4: - php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown encoding or conversion error.); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown encoding or conversion error); break; case 8: - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Argument is empty.); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, Argument is empty); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown error in mb_strpos.); - break; + php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown error in mb_strpos); + break; } RETVAL_FALSE; } @@ -2351,10 +2351,13 @@ RETURN_FALSE; } - if ((offset 0 offset mbfl_strlen(haystack)) || - (offset 0 -offset mbfl_strlen(haystack))) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); - RETURN_FALSE; + { + int haystack_char_len = mbfl_strlen(haystack); + if ((offset 0 offset haystack_char_len) || + (offset 0 -offset haystack_char_len)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); + RETURN_FALSE; + } } n = mbfl_strpos(haystack, needle, offset, 1); @@ -2411,10 +2414,6 @@ RETURN_FALSE; } - if ((unsigned int)offset haystack.len) { - RETURN_FALSE; - } - n = php_mb_stripos(1, (char *)haystack.val, haystack.len, (char *)needle.val, needle.len, offset, from_encoding TSRMLS_CC); if (n = 0) { @@ -4804,7 +4803,7 @@ /* {{{ MBSTRING_API int php_mb_stripos() */ -MBSTRING_API int php_mb_stripos(int mode, const char *old_haystack, unsigned int old_haystack_len, const char *old_needle, unsigned int old_needle_len, unsigned int offset, const char *from_encoding TSRMLS_DC) +MBSTRING_API int php_mb_stripos(int mode, const char *old_haystack, unsigned int old_haystack_len, const char *old_needle, unsigned int old_needle_len, long offset, const char *from_encoding TSRMLS_DC) { int n; mbfl_string haystack, needle; @@ -4847,9 +4846,21 @@ break; } - if (offset 0 || offset haystack.len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset not contained in string.); - break; + { + int haystack_char_len = mbfl_strlen(haystack); + +
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/mbstring mbstring.c /ext/mbstring/libmbfl/mbfl mbfilter.c /ext/mbstring/tests bug45923.phpt
moriyoshi Sat Feb 14 07:35:01 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/mbstring/tests bug45923.phpt Modified files: /php-srcNEWS /php-src/ext/mbstring mbstring.c /php-src/ext/mbstring/libmbfl/mbfl mbfilter.c Log: - MFH: Fix Bug #45923 (mb_st[r]ripos() offset not handled correctly) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1417r2=1.2027.2.547.2.1418diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1417 php-src/NEWS:1.2027.2.547.2.1418 --- php-src/NEWS:1.2027.2.547.2.1417Fri Feb 13 22:26:46 2009 +++ php-src/NEWSSat Feb 14 07:35:00 2009 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? Feb 2009, PHP 5.2.9 +- Fixed Bug #45923 (mb_st[r]ripos() offset not handled correctly). (Moriyoshi) 12 Feb 2009, PHP 5.2.9RC2 - Fixed bug #47353 (crash when creating a lot of objects in object destructor). http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.44r2=1.224.2.22.2.45diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.44 php-src/ext/mbstring/mbstring.c:1.224.2.22.2.45 --- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.44 Mon Feb 9 15:34:32 2009 +++ php-src/ext/mbstring/mbstring.c Sat Feb 14 07:35:01 2009 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mbstring.c,v 1.224.2.22.2.44 2009/02/09 15:34:32 iliaa Exp $ */ +/* $Id: mbstring.c,v 1.224.2.22.2.45 2009/02/14 07:35:01 moriyoshi Exp $ */ /* * PHP 4 Multibyte String module mbstring @@ -1653,12 +1653,12 @@ } } - if (offset 0 || (unsigned long)offset (unsigned long)mbfl_strlen(haystack)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset not contained in string.); + if (offset 0 || offset mbfl_strlen(haystack)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset not contained in string); RETURN_FALSE; } if (needle.len == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, Empty delimiter.); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Empty delimiter); RETURN_FALSE; } @@ -1670,17 +1670,17 @@ case 1: break; case 2: - php_error_docref(NULL TSRMLS_CC, E_WARNING, Needle has not positive length.); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Needle has not positive length); break; case 4: - php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown encoding or conversion error.); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown encoding or conversion error); break; case 8: - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Argument is empty.); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, Argument is empty); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown error in mb_strpos.); - break; + php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown error in mb_strpos); + break; } RETVAL_FALSE; } @@ -1767,10 +1767,13 @@ RETURN_FALSE; } - if ((offset 0 offset mbfl_strlen(haystack)) || - (offset 0 -offset mbfl_strlen(haystack))) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater than the length of haystack string); - RETURN_FALSE; + { + int haystack_char_len = mbfl_strlen(haystack); + if ((offset 0 offset haystack_char_len) || + (offset 0 -offset haystack_char_len)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset is greater than the length of haystack string); + RETURN_FALSE; + } } n = mbfl_strpos(haystack, needle, offset, 1); @@ -1824,10 +1827,6 @@ RETURN_FALSE; } - if(offset old_haystack_len){ - RETURN_FALSE; - } - n = php_mb_stripos(1, old_haystack, old_haystack_len, old_needle, old_needle_len, offset, from_encoding TSRMLS_CC); if (n = 0) { @@ -1987,7 +1986,7 @@ RETURN_FALSE; } - n = php_mb_stripos(0, haystack.val, haystack.len, needle.val, needle.len, 0, from_encoding TSRMLS_CC); + n = php_mb_stripos(0, haystack.val, haystack.len, needle.val, needle.len, 0, from_encoding
Re: [PHP-CVS] cvs: php-src /ext/bz2 bz2_filter.c
On Thu, Feb 5, 2009 at 22:32, Greg Beaver g...@chiaraquartet.net wrote: I really don't give a crap. Change it if you want, I was merging *existing* code in PHP_5_3 to HEAD, not adding new stuff. Which is exactly why we have major syncing issues. HEAD is for development. Stuff should be merged *to* 5.3, not *from* 5.3. There is no reason at all it should be done any differently. -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php