[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Aug 15 01:32:33 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3138r2=1.3139diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3138 php-src/ChangeLog:1.3139 --- php-src/ChangeLog:1.3138Thu Aug 14 01:32:20 2008 +++ php-src/ChangeLog Fri Aug 15 01:32:32 2008 @@ -1,3 +1,283 @@ +2008-08-14 Jani Taskinen [EMAIL PROTECTED] + +* ext/spl/examples/tests/dualiterator_001.phpt: + fix skipif + +* ext/standard/tests/file/bug26615.phpt + ext/standard/tests/file/bug26938.phpt + ext/standard/tests/file/proc_open01.phpt + sapi/cgi/tests/005.phpt + sapi/cgi/tests/006.phpt + sapi/cgi/tests/007.phpt + sapi/cgi/tests/include.inc + sapi/cli/tests/009.phpt + sapi/cli/tests/015.phpt: + - Fix tests + +* run-tests.php: + - No unnecessary errors please + +2008-08-14 Kalle Sommer Nielsen [EMAIL PROTECTED] + +* (PHP_5_3) + win32/readdir.h + win32/time.c: + MFH: + * Last _WIN32_WINNT macro redef + * Include config.w32.h where _WIN32_WINNT was + +2008-08-14 Jani Taskinen [EMAIL PROTECTED] + +* ext/spl/tests/dit_002.phpt: + - Skipif: as long as it is an extension, it can be disabled.. + +* ext/standard/tests/file/clearstatcache_001.phpt + ext/standard/tests/file/clearstatcache_001.phpt: + - Fix test: Do not leave your crap behind! + +2008-08-14 Kalle Sommer Nielsen [EMAIL PROTECTED] + +* win32/readdir.h + win32/time.c: + - Last _WIN32_WINNT macro redef + * Include config.w32.h where _WIN32_WINNT was + +2008-08-14 Jani Taskinen [EMAIL PROTECTED] + +* ZendEngine2/tests/bug45805.phpt: + add skipif (yes, reflection CAN be disabled still..) + +* tests/basic/bug20539.phpt: + - Fix test to use same path as test is as session.save_path to prevent +permission errors. + +2008-08-14 Etienne Kneuss [EMAIL PROTECTED] + +* ZendEngine2/zend_API.c + ZendEngine2/zend_closures.c + ZendEngine2/zend_object_handlers.c + ZendEngine2/zend_object_handlers.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h: + Handlerify get_closure + +2008-08-14 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_2) + ext/gd/tests/imageloadfont_invalid.phpt: + do not leave crap behind + +* (PHP_5_3) + run-tests.php: + Silencio for some unnecessary errors + +* (PHP_5_2) + run-tests.php: + - Nuke annoying errors already silenced elsewhere too + +* (PHP_5_3) + ZendEngine2/tests/bug40236.phpt + ext/standard/tests/general_functions/bug44394_2.phpt + ext/standard/tests/strings/nl2br_error.phpt: + fix test + +* (PHP_5_3) + sapi/cgi/tests/005.phpt + sapi/cgi/tests/006.phpt + sapi/cgi/tests/007.phpt + sapi/cgi/tests/include.inc + sapi/cli/tests/009.phpt + sapi/cli/tests/015.phpt + sapi/cli/tests/021.phpt: + fix tests + +* sapi/cgi/tests/006.phpt: + - Fix test + +* sapi/cli/tests/021.phpt + sapi/cli/tests/021.phpt: + + - Fix tests + +* (PHP_5_3) + ext/standard/credits_ext.h: + - Something moved out - update credits! + +2008-08-14 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + ZendEngine2/tests/exception_009.phpt: + - Fixed test + +* (PHP_5_2) + ZendEngine2/tests/exception_009.phpt + ZendEngine2/tests/exception_009.phpt: + - New test + +* ZendEngine2/zend_exceptions.c + ZendEngine2/tests/exception_009.phpt + ZendEngine2/tests/exception_009.phpt + ZendEngine2/tests/exception_009.phpt: + - Fixed crash (reported by Lupus Michaelis) + +2008-08-14 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS: + keep the style + +2008-08-14 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_2) + main/php_ini.c: + - MFH: move declaration on top and fix build error + +2008-08-14 Nuno Lopes [EMAIL PROTECTED] + +* (PHP_5_3) + ext/pcre/php_pcre.c + ext/pcre/tests/bug44925.phpt: + after rereading the documentation about preg_grep(), lets match the + behavior in HEAD (return the original array elements instead of the new + string). + tune the test accordingly + +* ext/pcre/php_pcre.c + ext/pcre/tests/bug44925.phpt: + sync with 5.3 branch. add test for bug #44925 + +* (PHP_5_3) + NEWS + ext/pcre/php_pcre.c + ext/pcre/tests/bug44925.phpt + ext/pcre/tests/bug44925.phpt: + Fixed bug #44925 (preg_grep() modifies input array) + +2008-08-14 Dmitry Stogov [EMAIL PROTECTED] + +* ext/phar/func_interceptors.c + ext/phar/func_interceptors.c + ext/phar/func_interceptors.h + ext/phar/func_interceptors.h + ext/phar/phar.c + ext/phar/phar.c: + Fixed bug #45613 Segfault when using is_file() on Apache-2.2.8 + +2008-08-14
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri Aug 15 01:32:36 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1360r2=1.1361diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1360 ZendEngine2/ChangeLog:1.1361 --- ZendEngine2/ChangeLog:1.1360Thu Aug 14 01:32:26 2008 +++ ZendEngine2/ChangeLog Fri Aug 15 01:32:36 2008 @@ -1,3 +1,53 @@ +2008-08-14 Jani Taskinen [EMAIL PROTECTED] + +* tests/bug45805.phpt: + add skipif (yes, reflection CAN be disabled still..) + +2008-08-14 Etienne Kneuss [EMAIL PROTECTED] + +* zend_API.c + zend_closures.c + zend_object_handlers.c + zend_object_handlers.h + zend_vm_def.h + zend_vm_execute.h: + Handlerify get_closure + +2008-08-14 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_3) + tests/bug40236.phpt: + fix test + +2008-08-14 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + tests/exception_009.phpt: + - Fixed test + +* (PHP_5_2) + tests/exception_009.phpt + tests/exception_009.phpt: + - New test + +* zend_exceptions.c + tests/exception_009.phpt + tests/exception_009.phpt + tests/exception_009.phpt: + - Fixed crash (reported by Lupus Michaelis) + +2008-08-14 Marcus Boerger [EMAIL PROTECTED] + +* zend.c + zend_exceptions.c + zend_exceptions.h + zend_execute_API.c + zend_globals.h + zend_objects.c + zend_vm_def.h + zend_vm_execute.h: + - Improved exception linking + 2008-08-13 Felipe Pena [EMAIL PROTECTED] * zend_API.c @@ -25595,7 +25645,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1360 2008/08/14 01:32:26 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1361 2008/08/15 01:32:36 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -27319,7 +27369,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1360 2008/08/14 01:32:26 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1361 2008/08/15 01:32:36 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard basic_functions.c string.c
On Thu, Aug 14, 2008 at 04:56, Kalle Sommer Nielsen [EMAIL PROTECTED] wrote: kalle Thu Aug 14 02:56:23 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS /php-src/ext/standard basic_functions.c string.c Log: MFH: Implemented feature request #34381 (nl2br() should have an option for XHTML/HTML compatible BR element) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.266r2=1.2027.2.547.2.965.2.267diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.266 php-src/NEWS:1.2027.2.547.2.965.2.267 --- php-src/NEWS:1.2027.2.547.2.965.2.266 Wed Aug 13 11:20:25 2008 +++ php-src/NEWSThu Aug 14 02:56:22 2008 @@ -12,6 +12,9 @@ - Added litespeed SAPI module. (George Wang) - Added ext/hash support to ext/session's ID generator. (Sara) +- Implemented feature request #34381 (nl2br() should have an option for + XHTML/HTML compatible BR element) (Kalle) Cool. And nice that you documented it right away.. but remember to add it to the scratchpad so it will be included in the upgrade guide. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.46r2=1.725.2.31.2.64.2.47diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.46 php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.47 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.46 Thu Aug 7 09:25:32 2008 +++ php-src/ext/standard/basic_functions.c Thu Aug 14 02:56:22 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.46 2008/08/07 09:25:32 lbarnaud Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.47 2008/08/14 02:56:22 kalle Exp $ */ #include php.h #include php_streams.h @@ -2739,6 +2739,7 @@ static ZEND_BEGIN_ARG_INFO(arginfo_nl2br, 0) ZEND_ARG_INFO(0, str) + ZEND_ARG_INFO(0, is_xhtml) This is wrong. is_xhtml is optional. it should be ZEND_BEGIN_ARG_INFO(arginfo_nl2br, 0, 0, 1) -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / Makefile.global /ext/standard info.c /main php_ini.c /sapi/cgi cgi_main.c /sapi/cli php_cli.c /sapi/milter php_milter.c
These two are failed. using invalid combinations of cmdline options [sapi/cgi/tests/005.phpt] using invalid combinations of cmdline options [sapi/cli/tests/009.phpt] Thanks. Dmitry. Jani Taskinen wrote: Because it didn't make sense not to allow using both. I thought I fixed those tests..? Or which ones do you mean? --Jani Dmitry Stogov [EMAIL PROTECTED] kirjoitti: Hi Jani, What is the reason of removing -n and -c option check in cli/cgi? It breaks two tests. Thanks. Dmitry. Jani Taskinen wrote: janiWed Aug 13 00:49:59 2008 UTC Modified files: /php-srcMakefile.global /php-src/ext/standardinfo.c /php-src/mainphp_ini.c /php-src/sapi/cgicgi_main.c /php-src/sapi/cli php_cli.c /php-src/sapi/milterphp_milter.cLog: [DOC]- Added methods to change/disable --with-config-file-scan-dir=PATH at [DOC] startup: [DOC] [DOC] To disable: Override default php.ini by using both -c and -n with [DOC] CGI/CLI or set PHP_INI_SCAN_DIR environment variable [DOC] to an empty string.[DOC] [DOC] To change: Simply set PHP_INI_SCAN_DIR environment variable to point[DOC] to another path. - Fixed bug #42604 (make test fails with --with-config-file-scan-dir=/some/path) - Implemented FR #45114 (Option to change --with-config-file-scan-dir) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- 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 crypt_blowfish.c php_crypt_r.h
hi Felipe! On Thu, Aug 14, 2008 at 3:13 AM, Felipe Pena [EMAIL PROTECTED] wrote: felipe Thu Aug 14 01:13:18 2008 UTC Modified files: /php-src/ext/standard crypt_blowfish.c php_crypt_r.h Log: - Fix build on BSD (5_3 and 5_2 are OK) Thanks for the fix! MFH? :) Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
kalle Thu Aug 14 09:26:54 2008 UTC Modified files: /php-src/ext/standard basic_functions.c Log: Fix arginfo for nl2br http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.914r2=1.915diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.914 php-src/ext/standard/basic_functions.c:1.915 --- php-src/ext/standard/basic_functions.c:1.914Thu Aug 14 02:55:13 2008 +++ php-src/ext/standard/basic_functions.c Thu Aug 14 09:26:54 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.914 2008/08/14 02:55:13 kalle Exp $ */ +/* $Id: basic_functions.c,v 1.915 2008/08/14 09:26:54 kalle Exp $ */ #include php.h #include php_streams.h @@ -2740,7 +2740,7 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO(arginfo_nl2br, 0) +ZEND_BEGIN_ARG_INFO(arginfo_nl2br, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, is_xhtml) ZEND_END_ARG_INFO() -- 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 basic_functions.c
kalle Thu Aug 14 09:27:34 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard basic_functions.c Log: MFH: Fix arginfo for nl2br http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.47r2=1.725.2.31.2.64.2.48diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.47 php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.48 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.47 Thu Aug 14 02:56:22 2008 +++ php-src/ext/standard/basic_functions.c Thu Aug 14 09:27:33 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.47 2008/08/14 02:56:22 kalle Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.48 2008/08/14 09:27:33 kalle Exp $ */ #include php.h #include php_streams.h @@ -2737,7 +2737,7 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO(arginfo_nl2br, 0) +ZEND_BEGIN_ARG_INFO(arginfo_nl2br, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, is_xhtml) ZEND_END_ARG_INFO() -- 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 quot_print.c
tony2001Thu Aug 14 09:29:22 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard quot_print.c
Log:
fix folding
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/quot_print.c?r1=1.29.2.2.2.1.2.2r2=1.29.2.2.2.1.2.3diff_format=u
Index: php-src/ext/standard/quot_print.c
diff -u php-src/ext/standard/quot_print.c:1.29.2.2.2.1.2.2
php-src/ext/standard/quot_print.c:1.29.2.2.2.1.2.3
--- php-src/ext/standard/quot_print.c:1.29.2.2.2.1.2.2 Fri Jun 20 14:53:57 2008
+++ php-src/ext/standard/quot_print.c Thu Aug 14 09:29:22 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: quot_print.c,v 1.29.2.2.2.1.2.2 2008/06/20 14:53:57 felipe Exp $ */
+/* $Id: quot_print.c,v 1.29.2.2.2.1.2.3 2008/08/14 09:29:22 tony2001 Exp $ */
#include stdlib.h
@@ -34,7 +34,7 @@
/*
* Converting HEX char to INT value
*/
-static char php_hex2int(int c)
+static char php_hex2int(int c) /* {{{ */
{
if (isdigit(c)) {
return c - '0';
@@ -49,8 +49,9 @@
return -1;
}
}
+/* }}} */
-PHPAPI unsigned char *php_quot_print_decode(const unsigned char *str, size_t
length, size_t *ret_length, int replace_us_by_ws)
+PHPAPI unsigned char *php_quot_print_decode(const unsigned char *str, size_t
length, size_t *ret_length, int replace_us_by_ws) /* {{{ */
{
register unsigned int i;
register unsigned const char *p1;
@@ -140,7 +141,7 @@
*ret_length = decoded_len;
return retval;
}
-
+/* }}} */
/*
*
--
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 basic_functions.c
tony2001Thu Aug 14 09:41:17 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard basic_functions.c Log: fix build compile before commit? http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.48r2=1.725.2.31.2.64.2.49diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.48 php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.49 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.48 Thu Aug 14 09:27:33 2008 +++ php-src/ext/standard/basic_functions.c Thu Aug 14 09:41:16 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.48 2008/08/14 09:27:33 kalle Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.49 2008/08/14 09:41:16 tony2001 Exp $ */ #include php.h #include php_streams.h @@ -2737,7 +2737,7 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO(arginfo_nl2br, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_nl2br, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, is_xhtml) ZEND_END_ARG_INFO() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
tony2001Thu Aug 14 09:41:47 2008 UTC Modified files: /php-src/ext/standard basic_functions.c Log: fix build http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.915r2=1.916diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.915 php-src/ext/standard/basic_functions.c:1.916 --- php-src/ext/standard/basic_functions.c:1.915Thu Aug 14 09:26:54 2008 +++ php-src/ext/standard/basic_functions.c Thu Aug 14 09:41:47 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.915 2008/08/14 09:26:54 kalle Exp $ */ +/* $Id: basic_functions.c,v 1.916 2008/08/14 09:41:47 tony2001 Exp $ */ #include php.h #include php_streams.h @@ -2740,7 +2740,7 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO(arginfo_nl2br, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_nl2br, 0, 0, 1) ZEND_ARG_INFO(0, str) ZEND_ARG_INFO(0, is_xhtml) ZEND_END_ARG_INFO() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli php_cli.c
tony2001Thu Aug 14 09:46:12 2008 UTC
Modified files:
/php-src/sapi/cli php_cli.c
Log:
nuke unused var
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.195r2=1.196diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.195 php-src/sapi/cli/php_cli.c:1.196
--- php-src/sapi/cli/php_cli.c:1.195Wed Aug 13 06:17:15 2008
+++ php-src/sapi/cli/php_cli.c Thu Aug 14 09:46:12 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.195 2008/08/13 06:17:15 dmitry Exp $ */
+/* $Id: php_cli.c,v 1.196 2008/08/14 09:46:12 tony2001 Exp $ */
#include php.h
#include php_globals.h
@@ -578,8 +578,6 @@
*/
static int cli_seek_file_begin(zend_file_handle *file_handle, char
*script_file, int *lineno TSRMLS_DC)
{
- int c;
-
*lineno = 1;
file_handle-type = ZEND_HANDLE_FP;
--
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) /sapi/cli php_cli.c
tony2001Thu Aug 14 09:46:26 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cli php_cli.c
Log:
MFH: nuke unused var
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.22.2.14r2=1.129.2.13.2.22.2.15diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.14
php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.15
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.14 Wed Aug 13 00:53:28 2008
+++ php-src/sapi/cli/php_cli.c Thu Aug 14 09:46:26 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.129.2.13.2.22.2.14 2008/08/13 00:53:28 jani Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.22.2.15 2008/08/14 09:46:26 tony2001 Exp $ */
#include php.h
#include php_globals.h
@@ -563,8 +563,6 @@
*/
static int cli_seek_file_begin(zend_file_handle *file_handle, char
*script_file, int *lineno TSRMLS_DC)
{
- int c;
-
*lineno = 1;
file_handle-type = ZEND_HANDLE_FP;
--
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
tony2001Thu Aug 14 10:10:56 2008 UTC
Modified files:
/php-src/ext/standard string.c
Log:
fix folding
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.679r2=1.680diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.679 php-src/ext/standard/string.c:1.680
--- php-src/ext/standard/string.c:1.679 Thu Aug 14 02:55:13 2008
+++ php-src/ext/standard/string.c Thu Aug 14 10:10:56 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.679 2008/08/14 02:55:13 kalle Exp $ */
+/* $Id: string.c,v 1.680 2008/08/14 10:10:56 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -656,6 +656,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Item '%ld'
is not valid, item);
RETURN_FALSE;
}
+ /* }}} */
value = nl_langinfo(item);
if (value == NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c quot_print.c quot_print.h /ext/standard/tests/strings quoted_printable_encode_001.phpt quoted_printable_encode_002.phpt
tony2001Thu Aug 14 10:11:26 2008 UTC
Added files:
/php-src/ext/standard/tests/strings
quoted_printable_encode_001.phpt
quoted_printable_encode_002.phpt
Modified files:
/php-src/ext/standard basic_functions.c quot_print.c quot_print.h
Log:
[DOC] add quoted_printable_encode()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.916r2=1.917diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.916
php-src/ext/standard/basic_functions.c:1.917
--- php-src/ext/standard/basic_functions.c:1.916Thu Aug 14 09:41:47 2008
+++ php-src/ext/standard/basic_functions.c Thu Aug 14 10:11:26 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.916 2008/08/14 09:41:47 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.917 2008/08/14 10:11:26 tony2001 Exp $ */
#include php.h
#include php_streams.h
@@ -2195,6 +2195,12 @@
ZEND_ARG_INFO(0, str)
ZEND_END_ARG_INFO()
/* }}} */
+/* {{{ quot_print.c */
+static
+ZEND_BEGIN_ARG_INFO(arginfo_quoted_printable_encode, 0)
+ ZEND_ARG_INFO(0, str)
+ZEND_END_ARG_INFO()
+/* }}} */
/* {{{ rand.c */
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_srand, 0, 0, 0)
@@ -3405,6 +3411,7 @@
#endif
PHP_FE(quoted_printable_decode,
arginfo_quoted_printable_decode)
+ PHP_FE(quoted_printable_encode,
arginfo_quoted_printable_encode)
PHP_FE(convert_cyr_string,
arginfo_convert_cyr_string)
PHP_FE(get_current_user,
arginfo_get_current_user)
PHP_FE(set_time_limit,
arginfo_set_time_limit)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/quot_print.c?r1=1.35r2=1.36diff_format=u
Index: php-src/ext/standard/quot_print.c
diff -u php-src/ext/standard/quot_print.c:1.35
php-src/ext/standard/quot_print.c:1.36
--- php-src/ext/standard/quot_print.c:1.35 Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/quot_print.c Thu Aug 14 10:11:26 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: quot_print.c,v 1.35 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: quot_print.c,v 1.36 2008/08/14 10:11:26 tony2001 Exp $ */
#include stdlib.h
@@ -143,6 +143,53 @@
}
/* }}} */
+#define PHP_QPRINT_MAXL 75
+
+PHPAPI unsigned char *php_quot_print_encode(const unsigned char *str, size_t
length, size_t *ret_length) /* {{{ */
+{
+ unsigned long lp = 0;
+ unsigned char c, *ret, *d;
+ char *hex = 0123456789ABCDEF;
+
+ ret = safe_emalloc(1, 3 * length + 3 * (((3 * length)/PHP_QPRINT_MAXL)
+ 1), 0);
+ d = ret;
+
+ while (length--) {
+ if (((c = *str++) == '\015') (*str == '\012') length 0)
{
+ *d++ = '\015';
+ *d++ = *str++;
+ length--;
+ lp = 0;
+ } else {
+ if (iscntrl (c) || (c == 0x7f) || (c 0x80) || (c ==
'=') || ((c == ' ') (*str == '\015'))) {
+ if ((lp += 3) PHP_QPRINT_MAXL) {
+ *d++ = '=';
+ *d++ = '\015';
+ *d++ = '\012';
+ lp = 3;
+ }
+ *d++ = '=';
+ *d++ = hex[c 4];
+ *d++ = hex[c 0xf];
+ } else {
+ if ((++lp) PHP_QPRINT_MAXL) {
+ *d++ = '=';
+ *d++ = '\015';
+ *d++ = '\012';
+ lp = 1;
+ }
+ *d++ = c;
+ }
+ }
+ }
+ *d = '\0';
+ *ret_length = d - ret;
+
+ ret = erealloc(ret, *ret_length + 1);
+ return ret;
+}
+/* }}} */
+
/*
*
* Decoding Quoted-printable string.
@@ -209,6 +256,26 @@
}
/* }}} */
+/* {{{ proto string quoted_printable_encode(string str) U */
+PHP_FUNCTION(quoted_printable_encode)
+{
+ char *str, *new_str;
+ int str_len;
+ size_t new_str_len;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS()
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard basic_functions.c quot_print.c quot_print.h /ext/standard/tests/strings quoted_printable_encode_001.phpt quoted_printable_encode_002.phpt
tony2001Thu Aug 14 10:12:24 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings
quoted_printable_encode_001.phpt
quoted_printable_encode_002.phpt
Modified files:
/php-src/ext/standard basic_functions.c quot_print.c quot_print.h
Log:
MFH: add quoted_printable_encode()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.49r2=1.725.2.31.2.64.2.50diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.49
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.50
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.49 Thu Aug 14
09:41:16 2008
+++ php-src/ext/standard/basic_functions.c Thu Aug 14 10:12:19 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.49 2008/08/14 09:41:16 tony2001
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.50 2008/08/14 10:12:19 tony2001
Exp $ */
#include php.h
#include php_streams.h
@@ -2210,6 +2210,12 @@
ZEND_ARG_INFO(0, str)
ZEND_END_ARG_INFO()
/* }}} */
+/* {{{ quot_print.c */
+static
+ZEND_BEGIN_ARG_INFO(arginfo_quoted_printable_encode, 0)
+ ZEND_ARG_INFO(0, str)
+ZEND_END_ARG_INFO()
+/* }}} */
/* {{{ rand.c */
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_srand, 0, 0, 0)
@@ -3371,6 +3377,7 @@
#endif
PHP_FE(quoted_printable_decode,
arginfo_quoted_printable_decode)
+ PHP_FE(quoted_printable_encode,
arginfo_quoted_printable_encode)
PHP_FE(convert_cyr_string,
arginfo_convert_cyr_string)
PHP_FE(get_current_user,
arginfo_get_current_user)
PHP_FE(set_time_limit,
arginfo_set_time_limit)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/quot_print.c?r1=1.29.2.2.2.1.2.3r2=1.29.2.2.2.1.2.4diff_format=u
Index: php-src/ext/standard/quot_print.c
diff -u php-src/ext/standard/quot_print.c:1.29.2.2.2.1.2.3
php-src/ext/standard/quot_print.c:1.29.2.2.2.1.2.4
--- php-src/ext/standard/quot_print.c:1.29.2.2.2.1.2.3 Thu Aug 14 09:29:22 2008
+++ php-src/ext/standard/quot_print.c Thu Aug 14 10:12:20 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: quot_print.c,v 1.29.2.2.2.1.2.3 2008/08/14 09:29:22 tony2001 Exp $ */
+/* $Id: quot_print.c,v 1.29.2.2.2.1.2.4 2008/08/14 10:12:20 tony2001 Exp $ */
#include stdlib.h
@@ -143,6 +143,53 @@
}
/* }}} */
+#define PHP_QPRINT_MAXL 75
+
+PHPAPI unsigned char *php_quot_print_encode(const unsigned char *str, size_t
length, size_t *ret_length) /* {{{ */
+{
+ unsigned long lp = 0;
+ unsigned char c, *ret, *d;
+ char *hex = 0123456789ABCDEF;
+
+ ret = safe_emalloc(1, 3 * length + 3 * (((3 * length)/PHP_QPRINT_MAXL)
+ 1), 0);
+ d = ret;
+
+ while (length--) {
+ if (((c = *str++) == '\015') (*str == '\012') length 0)
{
+ *d++ = '\015';
+ *d++ = *str++;
+ length--;
+ lp = 0;
+ } else {
+ if (iscntrl (c) || (c == 0x7f) || (c 0x80) || (c ==
'=') || ((c == ' ') (*str == '\015'))) {
+ if ((lp += 3) PHP_QPRINT_MAXL) {
+ *d++ = '=';
+ *d++ = '\015';
+ *d++ = '\012';
+ lp = 3;
+ }
+ *d++ = '=';
+ *d++ = hex[c 4];
+ *d++ = hex[c 0xf];
+ } else {
+ if ((++lp) PHP_QPRINT_MAXL) {
+ *d++ = '=';
+ *d++ = '\015';
+ *d++ = '\012';
+ lp = 1;
+ }
+ *d++ = c;
+ }
+ }
+ }
+ *d = '\0';
+ *ret_length = d - ret;
+
+ ret = erealloc(ret, *ret_length + 1);
+ return ret;
+}
+/* }}} */
+
/*
*
* Decoding Quoted-printable string.
@@ -209,6 +256,26 @@
}
/* }}} */
+/* {{{ proto string
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
tony2001Thu Aug 14 10:13:24 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: new function http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.267r2=1.2027.2.547.2.965.2.268diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.267 php-src/NEWS:1.2027.2.547.2.965.2.268 --- php-src/NEWS:1.2027.2.547.2.965.2.267 Thu Aug 14 02:56:22 2008 +++ php-src/NEWSThu Aug 14 10:13:23 2008 @@ -11,6 +11,7 @@ clearstatcache(). (Jani, Arnaud) - Added litespeed SAPI module. (George Wang) - Added ext/hash support to ext/session's ID generator. (Sara) +- Added quoted_printable_encode() function. (Tony) - Implemented feature request #34381 (nl2br() should have an option for XHTML/HTML compatible BR element) (Kalle) -- 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 func_interceptors.c func_interceptors.h phar.c
dmitry Thu Aug 14 13:01:28 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar func_interceptors.c func_interceptors.h phar.c
Log:
Fixed bug #45613 Segfault when using is_file() on Apache-2.2.8
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.20.2.13r2=1.20.2.14diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.20.2.13
php-src/ext/phar/func_interceptors.c:1.20.2.14
--- php-src/ext/phar/func_interceptors.c:1.20.2.13 Tue Aug 12 14:56:52 2008
+++ php-src/ext/phar/func_interceptors.cThu Aug 14 13:01:28 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: func_interceptors.c,v 1.20.2.13 2008/08/12 14:56:52 helly Exp $ */
+/* $Id: func_interceptors.c,v 1.20.2.14 2008/08/14 13:01:28 dmitry Exp $ */
#include phar_internal.h
@@ -1130,6 +1130,85 @@
}
/* }}} */
+static struct _phar_orig_functions {
+ void(*orig_fopen)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_file_get_contents)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_is_file)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_is_link)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_is_dir)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_opendir)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_file_exists)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_fileperms)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_fileinode)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_filesize)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_fileowner)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_filegroup)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_fileatime)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_filemtime)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_filectime)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_filetype)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_is_writable)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_is_readable)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_is_executable)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_lstat)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_readfile)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_stat)(INTERNAL_FUNCTION_PARAMETERS);
+} phar_orig_functions = {NULL};
+
+void phar_save_orig_functions(TSRMLS_D) /* {{{ */
+{
+ phar_orig_functions.orig_fopen = PHAR_G(orig_fopen);
+ phar_orig_functions.orig_file_get_contents =
PHAR_G(orig_file_get_contents);
+ phar_orig_functions.orig_is_file = PHAR_G(orig_is_file);
+ phar_orig_functions.orig_is_link = PHAR_G(orig_is_link);
+ phar_orig_functions.orig_is_dir= PHAR_G(orig_is_dir);
+ phar_orig_functions.orig_opendir = PHAR_G(orig_opendir);
+ phar_orig_functions.orig_file_exists = PHAR_G(orig_file_exists);
+ phar_orig_functions.orig_fileperms = PHAR_G(orig_fileperms);
+ phar_orig_functions.orig_fileinode = PHAR_G(orig_fileinode);
+ phar_orig_functions.orig_filesize = PHAR_G(orig_filesize);
+ phar_orig_functions.orig_fileowner = PHAR_G(orig_fileowner);
+ phar_orig_functions.orig_filegroup = PHAR_G(orig_filegroup);
+ phar_orig_functions.orig_fileatime = PHAR_G(orig_fileatime);
+ phar_orig_functions.orig_filemtime = PHAR_G(orig_filemtime);
+ phar_orig_functions.orig_filectime = PHAR_G(orig_filectime);
+ phar_orig_functions.orig_filetype = PHAR_G(orig_filetype);
+ phar_orig_functions.orig_is_writable = PHAR_G(orig_is_writable);
+ phar_orig_functions.orig_is_readable = PHAR_G(orig_is_readable);
+ phar_orig_functions.orig_is_executable = PHAR_G(orig_is_executable);
+ phar_orig_functions.orig_lstat = PHAR_G(orig_lstat);
+ phar_orig_functions.orig_readfile = PHAR_G(orig_readfile);
+ phar_orig_functions.orig_stat = PHAR_G(orig_stat);
+}
+/* }}} */
+
+void phar_restore_orig_functions(TSRMLS_D) /* {{{ */
+{
+ PHAR_G(orig_fopen) = phar_orig_functions.orig_fopen;
+ PHAR_G(orig_file_get_contents) =
phar_orig_functions.orig_file_get_contents;
+ PHAR_G(orig_is_file) = phar_orig_functions.orig_is_file;
+ PHAR_G(orig_is_link) = phar_orig_functions.orig_is_link;
+ PHAR_G(orig_is_dir)= phar_orig_functions.orig_is_dir;
+ PHAR_G(orig_opendir) = phar_orig_functions.orig_opendir;
+ PHAR_G(orig_file_exists) = phar_orig_functions.orig_file_exists;
+ PHAR_G(orig_fileperms) = phar_orig_functions.orig_fileperms;
+
[PHP-CVS] cvs: php-src /ext/phar func_interceptors.c func_interceptors.h phar.c
dmitry Thu Aug 14 13:02:13 2008 UTC
Modified files:
/php-src/ext/phar func_interceptors.c func_interceptors.h phar.c
Log:
Fixed bug #45613 Segfault when using is_file() on Apache-2.2.8
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/func_interceptors.c?r1=1.24r2=1.25diff_format=u
Index: php-src/ext/phar/func_interceptors.c
diff -u php-src/ext/phar/func_interceptors.c:1.24
php-src/ext/phar/func_interceptors.c:1.25
--- php-src/ext/phar/func_interceptors.c:1.24 Tue Aug 12 15:37:36 2008
+++ php-src/ext/phar/func_interceptors.cThu Aug 14 13:02:13 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: func_interceptors.c,v 1.24 2008/08/12 15:37:36 helly Exp $ */
+/* $Id: func_interceptors.c,v 1.25 2008/08/14 13:02:13 dmitry Exp $ */
#include phar_internal.h
@@ -1130,6 +1130,85 @@
}
/* }}} */
+static struct _phar_orig_functions {
+ void(*orig_fopen)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_file_get_contents)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_is_file)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_is_link)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_is_dir)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_opendir)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_file_exists)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_fileperms)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_fileinode)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_filesize)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_fileowner)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_filegroup)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_fileatime)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_filemtime)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_filectime)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_filetype)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_is_writable)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_is_readable)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_is_executable)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_lstat)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_readfile)(INTERNAL_FUNCTION_PARAMETERS);
+ void(*orig_stat)(INTERNAL_FUNCTION_PARAMETERS);
+} phar_orig_functions = {NULL};
+
+void phar_save_orig_functions(TSRMLS_D) /* {{{ */
+{
+ phar_orig_functions.orig_fopen = PHAR_G(orig_fopen);
+ phar_orig_functions.orig_file_get_contents =
PHAR_G(orig_file_get_contents);
+ phar_orig_functions.orig_is_file = PHAR_G(orig_is_file);
+ phar_orig_functions.orig_is_link = PHAR_G(orig_is_link);
+ phar_orig_functions.orig_is_dir= PHAR_G(orig_is_dir);
+ phar_orig_functions.orig_opendir = PHAR_G(orig_opendir);
+ phar_orig_functions.orig_file_exists = PHAR_G(orig_file_exists);
+ phar_orig_functions.orig_fileperms = PHAR_G(orig_fileperms);
+ phar_orig_functions.orig_fileinode = PHAR_G(orig_fileinode);
+ phar_orig_functions.orig_filesize = PHAR_G(orig_filesize);
+ phar_orig_functions.orig_fileowner = PHAR_G(orig_fileowner);
+ phar_orig_functions.orig_filegroup = PHAR_G(orig_filegroup);
+ phar_orig_functions.orig_fileatime = PHAR_G(orig_fileatime);
+ phar_orig_functions.orig_filemtime = PHAR_G(orig_filemtime);
+ phar_orig_functions.orig_filectime = PHAR_G(orig_filectime);
+ phar_orig_functions.orig_filetype = PHAR_G(orig_filetype);
+ phar_orig_functions.orig_is_writable = PHAR_G(orig_is_writable);
+ phar_orig_functions.orig_is_readable = PHAR_G(orig_is_readable);
+ phar_orig_functions.orig_is_executable = PHAR_G(orig_is_executable);
+ phar_orig_functions.orig_lstat = PHAR_G(orig_lstat);
+ phar_orig_functions.orig_readfile = PHAR_G(orig_readfile);
+ phar_orig_functions.orig_stat = PHAR_G(orig_stat);
+}
+/* }}} */
+
+void phar_restore_orig_functions(TSRMLS_D) /* {{{ */
+{
+ PHAR_G(orig_fopen) = phar_orig_functions.orig_fopen;
+ PHAR_G(orig_file_get_contents) =
phar_orig_functions.orig_file_get_contents;
+ PHAR_G(orig_is_file) = phar_orig_functions.orig_is_file;
+ PHAR_G(orig_is_link) = phar_orig_functions.orig_is_link;
+ PHAR_G(orig_is_dir)= phar_orig_functions.orig_is_dir;
+ PHAR_G(orig_opendir) = phar_orig_functions.orig_opendir;
+ PHAR_G(orig_file_exists) = phar_orig_functions.orig_file_exists;
+ PHAR_G(orig_fileperms) = phar_orig_functions.orig_fileperms;
+ PHAR_G(orig_fileinode) =
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/pcre php_pcre.c /ext/pcre/tests bug44925.phpt
nlopess Thu Aug 14 13:12:42 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pcre/tests bug44925.phpt
Modified files:
/php-srcNEWS
/php-src/ext/pcre php_pcre.c
Log:
Fixed bug #44925 (preg_grep() modifies input array)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.268r2=1.2027.2.547.2.965.2.269diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.268
php-src/NEWS:1.2027.2.547.2.965.2.269
--- php-src/NEWS:1.2027.2.547.2.965.2.268 Thu Aug 14 10:13:23 2008
+++ php-src/NEWSThu Aug 14 13:12:42 2008
@@ -30,6 +30,7 @@
- Fixed bug #45545 (DateInterval has 4 char limitation for ISO durations).
(Derick)
- Fixed bug #45044 (relative paths not resolved correctly). (Dmitry)
+- Fixed bug #44925 (preg_grep() modifies input array). (Nuno)
- Fixed bug #44100 (Inconsistent handling of static array declarations with
duplicate keys). (Dmitry)
- Fixed bug #43817 (opendir() fails on Windows directories with parent
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.19r2=1.168.2.9.2.21.2.20diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.19
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.20
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.19 Sat Aug 2 04:46:06 2008
+++ php-src/ext/pcre/php_pcre.c Thu Aug 14 13:12:42 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.19 2008/08/02 04:46:06 felipe Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.20 2008/08/14 13:12:42 nlopess Exp $ */
#include php.h
#include php_ini.h
@@ -1743,13 +1743,30 @@
/* Go through the input array */
zend_hash_internal_pointer_reset(Z_ARRVAL_P(input));
- while(zend_hash_get_current_data(Z_ARRVAL_P(input), (void **)entry) ==
SUCCESS) {
+ while (zend_hash_get_current_data(Z_ARRVAL_P(input), (void **)entry)
== SUCCESS) {
+ zend_bool is_copy;
+ zval *str;
+
+ switch (Z_TYPE_PP(entry)) {
+ case IS_STRING:
+ is_copy = 0;
+ str = *entry;
+ break;
+
+ default:
+ is_copy = 1;
- convert_to_string_ex(entry);
+ ALLOC_ZVAL(str);
+ Z_ADDREF_PP(entry); /* the function below
decreases the ref counting */
+ COPY_PZVAL_TO_ZVAL(*str, *entry);
+
+ convert_to_string(str);
+ break;
+ }
/* Perform the match */
- count = pcre_exec(pce-re, extra, Z_STRVAL_PP(entry),
- Z_STRLEN_PP(entry), 0,
+ count = pcre_exec(pce-re, extra, Z_STRVAL_P(str),
+ Z_STRLEN_P(str), 0,
0, offsets, size_offsets);
/* Check for too many substrings condition. */
@@ -1762,25 +1779,30 @@
}
/* If the entry fits our requirements */
- if ((count 0 !invert) ||
- (count == PCRE_ERROR_NOMATCH invert)) {
- Z_ADDREF_PP(entry);
+ if ((count 0 !invert) || (count == PCRE_ERROR_NOMATCH
invert)) {
+
+ if (!is_copy) {
+ SEPARATE_ARG_IF_REF(str);
+ }
/* Add to return array */
switch (zend_hash_get_current_key(Z_ARRVAL_P(input),
string_key, num_key, 0))
{
case HASH_KEY_IS_STRING:
zend_hash_update(Z_ARRVAL_P(return_value), string_key,
-
strlen(string_key)+1, entry, sizeof(zval *), NULL);
+
strlen(string_key)+1, str, sizeof(zval *), NULL);
break;
case HASH_KEY_IS_LONG:
-
zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, entry,
+
zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, str,
sizeof(zval *), NULL);
break;
}
+ } else if (is_copy) {
+ zval_dtor(str);
+ FREE_ZVAL(str);
}
-
+
[PHP-CVS] cvs: php-src /ext/pcre php_pcre.c /ext/pcre/tests bug44925.phpt
nlopess Thu Aug 14 14:35:23 2008 UTC
Modified files:
/php-src/ext/pcre php_pcre.c
/php-src/ext/pcre/tests bug44925.phpt
Log:
sync with 5.3 branch. add test for bug #44925
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.237r2=1.238diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.237 php-src/ext/pcre/php_pcre.c:1.238
--- php-src/ext/pcre/php_pcre.c:1.237 Sat Aug 2 04:40:44 2008
+++ php-src/ext/pcre/php_pcre.c Thu Aug 14 14:35:22 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.237 2008/08/02 04:40:44 felipe Exp $ */
+/* $Id: php_pcre.c,v 1.238 2008/08/14 14:35:22 nlopess Exp $ */
/* TODO
* php_pcre_replace_impl():
@@ -1976,9 +1976,8 @@
/* Go through the input array */
zend_hash_internal_pointer_reset(Z_ARRVAL_P(input));
while(zend_hash_get_current_data(Z_ARRVAL_P(input), (void **)entry) ==
SUCCESS) {
- zval subject;
+ zval subject = **entry;
- subject = **entry;
if (Z_TYPE_PP(entry) != IS_STRING) {
zval_copy_ctor(subject);
convert_to_string_with_converter(subject,
UG(utf8_conv));
@@ -2001,8 +2000,8 @@
}
/* If the entry fits our requirements */
- if ((count 0 !invert) ||
- (count == PCRE_ERROR_NOMATCH invert)) {
+ if ((count 0 !invert) || (count == PCRE_ERROR_NOMATCH
invert)) {
+
Z_ADDREF_PP(entry);
/* Add to return array */
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug44925.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pcre/tests/bug44925.phpt
diff -u /dev/null php-src/ext/pcre/tests/bug44925.phpt:1.2
--- /dev/null Thu Aug 14 14:35:23 2008
+++ php-src/ext/pcre/tests/bug44925.phptThu Aug 14 14:35:22 2008
@@ -0,0 +1,107 @@
+--TEST--
+Bug #44925 (preg_grep() modifies input array)
+--FILE--
+?php
+$str1 = 'a';
+$str2 = 'b';
+
+$array=Array(1,2,3,1.1,FALSE,NULL,Array(), $str1, $str2);
+
+var_dump($array);
+
+var_dump(preg_grep('/do not match/',$array));
+
+$a = preg_grep('/./',$array);
+var_dump($a);
+
+$str1 = 'x';
+$str2 = 'y';
+
+var_dump($a); // check if array is still ok
+
+var_dump($array);
+
+?
+--EXPECTF--
+array(9) {
+ [0]=
+ unicode(1) 1
+ [1]=
+ int(2)
+ [2]=
+ int(3)
+ [3]=
+ float(1.1)
+ [4]=
+ bool(false)
+ [5]=
+ NULL
+ [6]=
+ array(0) {
+ }
+ [7]=
+ unicode(1) a
+ [8]=
+ unicode(1) b
+}
+
+Notice: Array to string conversion in %sbug44925.php on line 9
+array(0) {
+}
+
+Notice: Array to string conversion in %sbug44925.php on line 11
+array(7) {
+ [0]=
+ unicode(1) 1
+ [1]=
+ int(2)
+ [2]=
+ int(3)
+ [3]=
+ float(1.1)
+ [6]=
+ array(0) {
+ }
+ [7]=
+ unicode(1) a
+ [8]=
+ unicode(1) b
+}
+array(7) {
+ [0]=
+ unicode(1) 1
+ [1]=
+ int(2)
+ [2]=
+ int(3)
+ [3]=
+ float(1.1)
+ [6]=
+ array(0) {
+ }
+ [7]=
+ unicode(1) a
+ [8]=
+ unicode(1) y
+}
+array(9) {
+ [0]=
+ unicode(1) 1
+ [1]=
+ int(2)
+ [2]=
+ int(3)
+ [3]=
+ float(1.1)
+ [4]=
+ bool(false)
+ [5]=
+ NULL
+ [6]=
+ array(0) {
+ }
+ [7]=
+ unicode(1) a
+ [8]=
+ unicode(1) y
+}
--
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/pcre php_pcre.c /ext/pcre/tests bug44925.phpt
nlopess Thu Aug 14 14:37:39 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pcre php_pcre.c
/php-src/ext/pcre/tests bug44925.phpt
Log:
after rereading the documentation about preg_grep(), lets match the behavior
in HEAD (return the original array elements instead of the new string).
tune the test accordingly
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.20r2=1.168.2.9.2.21.2.21diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.20
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.21
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.20 Thu Aug 14 13:12:42 2008
+++ php-src/ext/pcre/php_pcre.c Thu Aug 14 14:37:39 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.20 2008/08/14 13:12:42 nlopess Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.21 2008/08/14 14:37:39 nlopess Exp $ */
#include php.h
#include php_ini.h
@@ -1744,29 +1744,16 @@
/* Go through the input array */
zend_hash_internal_pointer_reset(Z_ARRVAL_P(input));
while (zend_hash_get_current_data(Z_ARRVAL_P(input), (void **)entry)
== SUCCESS) {
- zend_bool is_copy;
- zval *str;
+ zval subject = **entry;
- switch (Z_TYPE_PP(entry)) {
- case IS_STRING:
- is_copy = 0;
- str = *entry;
- break;
-
- default:
- is_copy = 1;
-
- ALLOC_ZVAL(str);
- Z_ADDREF_PP(entry); /* the function below
decreases the ref counting */
- COPY_PZVAL_TO_ZVAL(*str, *entry);
-
- convert_to_string(str);
- break;
+ if (Z_TYPE_PP(entry) != IS_STRING) {
+ zval_copy_ctor(subject);
+ convert_to_string(subject);
}
/* Perform the match */
- count = pcre_exec(pce-re, extra, Z_STRVAL_P(str),
- Z_STRLEN_P(str), 0,
+ count = pcre_exec(pce-re, extra, Z_STRVAL(subject),
+ Z_STRLEN(subject), 0,
0, offsets, size_offsets);
/* Check for too many substrings condition. */
@@ -1781,26 +1768,25 @@
/* If the entry fits our requirements */
if ((count 0 !invert) || (count == PCRE_ERROR_NOMATCH
invert)) {
- if (!is_copy) {
- SEPARATE_ARG_IF_REF(str);
- }
+ Z_ADDREF_PP(entry);
/* Add to return array */
switch (zend_hash_get_current_key(Z_ARRVAL_P(input),
string_key, num_key, 0))
{
case HASH_KEY_IS_STRING:
zend_hash_update(Z_ARRVAL_P(return_value), string_key,
-
strlen(string_key)+1, str, sizeof(zval *), NULL);
+
strlen(string_key)+1, entry, sizeof(zval *), NULL);
break;
case HASH_KEY_IS_LONG:
-
zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, str,
+
zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, entry,
sizeof(zval *), NULL);
break;
}
- } else if (is_copy) {
- zval_dtor(str);
- FREE_ZVAL(str);
+ }
+
+ if (Z_TYPE_PP(entry) != IS_STRING) {
+ zval_dtor(subject);
}
zend_hash_move_forward(Z_ARRVAL_P(input));
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug44925.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/pcre/tests/bug44925.phpt
diff -u php-src/ext/pcre/tests/bug44925.phpt:1.1.2.1
php-src/ext/pcre/tests/bug44925.phpt:1.1.2.2
--- php-src/ext/pcre/tests/bug44925.phpt:1.1.2.1Thu Aug 14 13:12:42 2008
+++ php-src/ext/pcre/tests/bug44925.phptThu Aug 14 14:37:39 2008
@@ -54,33 +54,35 @@
[0]=
string(1) 1
[1]=
- string(1) 2
+ int(2)
[2]=
- string(1) 3
+ int(3)
[3]=
- string(3) 1.1
+ float(1.1)
[6]=
- string(5) Array
+ array(0) {
+ }
[7]=
string(1) a
[8]=
- string(1) b
+
[PHP-CVS] cvs: php-src(PHP_5_2) /main php_ini.c
felipe Thu Aug 14 16:34:30 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main php_ini.c
Log:
- MFH: move declaration on top and fix build error
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.17r2=1.136.2.4.2.18diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.4.2.17
php-src/main/php_ini.c:1.136.2.4.2.18
--- php-src/main/php_ini.c:1.136.2.4.2.17 Wed Aug 13 01:01:29 2008
+++ php-src/main/php_ini.c Thu Aug 14 16:34:30 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ini.c,v 1.136.2.4.2.17 2008/08/13 01:01:29 jani Exp $ */
+/* $Id: php_ini.c,v 1.136.2.4.2.18 2008/08/14 16:34:30 felipe Exp $ */
#include php.h
#include ext/standard/info.h
@@ -261,6 +261,7 @@
{
char *php_ini_file_name = NULL;
char *php_ini_search_path = NULL;
+ int php_ini_scanned_path_len;
int safe_mode_state;
char *open_basedir;
int free_ini_search_path = 0;
@@ -527,7 +528,7 @@
/* Or fall back using possible --with-config-file-scan-dir
setting (defaults to empty string!) */
php_ini_scanned_path = PHP_CONFIG_FILE_SCAN_DIR;
}
- int php_ini_scanned_path_len = strlen(php_ini_scanned_path);
+ php_ini_scanned_path_len = strlen(php_ini_scanned_path);
/* Scan and parse any .ini files found in scan path if path not empty.
*/
if (!sapi_module.php_ini_ignore php_ini_scanned_path_len) {
--
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 crypt_blowfish.c php_crypt_r.h
On Thu, Aug 14, 2008 at 10:45, Pierre Joye [EMAIL PROTECTED] wrote: hi Felipe! On Thu, Aug 14, 2008 at 3:13 AM, Felipe Pena [EMAIL PROTECTED] wrote: felipe Thu Aug 14 01:13:18 2008 UTC Modified files: /php-src/ext/standard crypt_blowfish.c php_crypt_r.h Log: - Fix build on BSD (5_3 and 5_2 are OK) Thanks for the fix! MFH? :) To the now dead 4_4? The commit message says 5_3 and 5_2 don't need the fix.. :) -Hannes -- 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 crypt_blowfish.c php_crypt_r.h
On Thu, Aug 14, 2008 at 7:34 PM, Hannes Magnusson [EMAIL PROTECTED] wrote: On Thu, Aug 14, 2008 at 10:45, Pierre Joye [EMAIL PROTECTED] wrote: hi Felipe! On Thu, Aug 14, 2008 at 3:13 AM, Felipe Pena [EMAIL PROTECTED] wrote: felipe Thu Aug 14 01:13:18 2008 UTC Modified files: /php-src/ext/standard crypt_blowfish.c php_crypt_r.h Log: - Fix build on BSD (5_3 and 5_2 are OK) Thanks for the fix! MFH? :) To the now dead 4_4? The commit message says 5_3 and 5_2 don't need the fix.. :) I read FBSD 5.3, don't ask why :) Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- 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
janiThu Aug 14 18:19:52 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: keep the style http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.269r2=1.2027.2.547.2.965.2.270diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.269 php-src/NEWS:1.2027.2.547.2.965.2.270 --- php-src/NEWS:1.2027.2.547.2.965.2.269 Thu Aug 14 13:12:42 2008 +++ php-src/NEWSThu Aug 14 18:19:49 2008 @@ -6,15 +6,14 @@ - Changed session_start() to return false when session startup fails. (Jani) - Added system independent realpath() implementation which caches intermediate - directories in realpath-cache (Dmitry) + directories in realpath-cache. (Dmitry) - Added optional clear_realpath_cache and filename parameters to clearstatcache(). (Jani, Arnaud) - Added litespeed SAPI module. (George Wang) - Added ext/hash support to ext/session's ID generator. (Sara) - Added quoted_printable_encode() function. (Tony) - -- Implemented feature request #34381 (nl2br() should have an option for - XHTML/HTML compatible BR element) (Kalle) +- Added optional is_xhtml parameter to nl2br() which makes the function + output br when false and br / when true (FR #34381). (Kalle) - Fixed a bug causing miscalculations with the last weekday of n month relative time string. (Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/pcre php_pcre.c /ext/pcre/tests bug44925.phpt
Doesn't this bug exist in PHP_5_2 branch? That's not (AFAIK) dead branch yet so
bug fixes MUST go there too.
In which case you move that NEWS entry to the PHP_5_2 NEWS..
--Jani
Nuno Lopes [EMAIL PROTECTED] kirjoitti:
nlopess Thu Aug 14 13:12:42 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pcre/tests bug44925.phpt
Modified files:
/php-src NEWS
/php-src/ext/pcre php_pcre.c
Log:
Fixed bug #44925 (preg_grep() modifies input array)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.268r2=1.2027.2.547.2.965.2.269diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.268
php-src/NEWS:1.2027.2.547.2.965.2.269
--- php-src/NEWS:1.2027.2.547.2.965.2.268 Thu Aug 14 10:13:23 2008
+++ php-src/NEWSThu Aug 14 13:12:42 2008
@@ -30,6 +30,7 @@
- Fixed bug #45545 (DateInterval has 4 char limitation for ISO durations).
(Derick)
- Fixed bug #45044 (relative paths not resolved correctly). (Dmitry)
+- Fixed bug #44925 (preg_grep() modifies input array). (Nuno)
- Fixed bug #44100 (Inconsistent handling of static array declarations with
duplicate keys). (Dmitry)
- Fixed bug #43817 (opendir() fails on Windows directories with parent
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.19r2=1.168.2.9.2.21.2.20diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.19
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.20
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.19 Sat Aug 2 04:46:06 2008
+++ php-src/ext/pcre/php_pcre.c Thu Aug 14 13:12:42 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.19 2008/08/02 04:46:06 felipe Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.20 2008/08/14 13:12:42 nlopess Exp $ */
#include php.h
#include php_ini.h
@@ -1743,13 +1743,30 @@
/* Go through the input array */
zend_hash_internal_pointer_reset(Z_ARRVAL_P(input));
- while(zend_hash_get_current_data(Z_ARRVAL_P(input), (void **)entry) ==
SUCCESS) {
+ while (zend_hash_get_current_data(Z_ARRVAL_P(input), (void **)entry)
== SUCCESS) {
+ zend_bool is_copy;
+ zval *str;
+
+ switch (Z_TYPE_PP(entry)) {
+ case IS_STRING:
+ is_copy = 0;
+ str = *entry;
+ break;
+
+ default:
+ is_copy = 1;
- convert_to_string_ex(entry);
+ ALLOC_ZVAL(str);
+ Z_ADDREF_PP(entry); /* the function below
decreases the ref counting */
+ COPY_PZVAL_TO_ZVAL(*str, *entry);
+
+ convert_to_string(str);
+ break;
+ }
/* Perform the match */
- count = pcre_exec(pce-re, extra, Z_STRVAL_PP(entry),
- Z_STRLEN_PP(entry), 0,
+ count = pcre_exec(pce-re, extra, Z_STRVAL_P(str),
+ Z_STRLEN_P(str), 0,
0, offsets, size_offsets);
/* Check for too many substrings condition. */
@@ -1762,25 +1779,30 @@
}
/* If the entry fits our requirements */
- if ((count 0 !invert) ||
- (count == PCRE_ERROR_NOMATCH invert)) {
- Z_ADDREF_PP(entry);
+ if ((count 0 !invert) || (count == PCRE_ERROR_NOMATCH
invert)) {
+
+ if (!is_copy) {
+ SEPARATE_ARG_IF_REF(str);
+ }
/* Add to return array */
switch (zend_hash_get_current_key(Z_ARRVAL_P(input),
string_key, num_key, 0))
{
case HASH_KEY_IS_STRING:
zend_hash_update(Z_ARRVAL_P(return_value), string_key,
-
strlen(string_key)+1, entry, sizeof(zval *), NULL);
+
strlen(string_key)+1, str, sizeof(zval *), NULL);
break;
case HASH_KEY_IS_LONG:
-
zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, entry,
+
zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, str,
sizeof(zval *), NULL);
break;
}
+ } else if (is_copy) {
+ zval_dtor(str);
+
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard credits_ext.h
janiThu Aug 14 19:21:39 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard credits_ext.h Log: - Something moved out - update credits! http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.30.2.6.2.6.2.6r2=1.30.2.6.2.6.2.7diff_format=u Index: php-src/ext/standard/credits_ext.h diff -u php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.6 php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.7 --- php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.6 Sat Jul 26 22:19:41 2008 +++ php-src/ext/standard/credits_ext.h Thu Aug 14 19:21:39 2008 @@ -19,12 +19,10 @@ CREDIT_LINE(cURL, Sterling Hughes); CREDIT_LINE(Date/Time Support, Derick Rethans); CREDIT_LINE(DBA, Sascha Schumann, Marcus Boerger); -CREDIT_LINE(dBase, Jim Winstead); CREDIT_LINE(DB-LIB (MS SQL, Sybase), Wez Furlong, Frank M. Kromann); CREDIT_LINE(DOM, Christian Stocker, Rob Richards, Marcus Boerger); CREDIT_LINE(ereg, Rasmus Lerdorf, Jim Winstead, Jaakko Hyvätti); CREDIT_LINE(EXIF, Rasmus Lerdorf, Marcus Boerger); -CREDIT_LINE(FBSQL, Frank M. Kromann); CREDIT_LINE(fileinfo, Ilia Alshanetsky, Derick Rethans); CREDIT_LINE(Firebird/InterBase driver for PDO, Ard Biesheuvel); CREDIT_LINE(FTP, Stefan Esser, Andrew Skalski); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi/tests 005.phpt 006.phpt 007.phpt include.inc /sapi/cli/tests 009.phpt 015.phpt 021.phpt
janiThu Aug 14 20:05:00 2008 UTC
Modified files:
/php-src/sapi/cgi/tests 005.phpt 006.phpt 007.phpt include.inc
/php-src/sapi/cli/tests 009.phpt 015.phpt 021.phpt
Log:
- Fix tests
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/005.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/sapi/cgi/tests/005.phpt
diff -u php-src/sapi/cgi/tests/005.phpt:1.1 php-src/sapi/cgi/tests/005.phpt:1.2
--- php-src/sapi/cgi/tests/005.phpt:1.1 Tue Apr 17 19:48:22 2007
+++ php-src/sapi/cgi/tests/005.phpt Thu Aug 14 20:04:59 2008
@@ -10,15 +10,12 @@
$php = get_cgi_path();
reset_env_vars();
-var_dump(`$php -n -c -f 'wrong'`);
var_dump(`$php -n -a -f 'wrong'`);
var_dump(`$php -n -f 'wrong' -a`);
echo Done\n;
?
--EXPECTF--
-string(55) You cannot use both -n and -c switch. Use -h for help.
-
string(51) No input file specified.
Interactive mode enabled
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/006.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/sapi/cgi/tests/006.phpt
diff -u php-src/sapi/cgi/tests/006.phpt:1.2 php-src/sapi/cgi/tests/006.phpt:1.3
--- php-src/sapi/cgi/tests/006.phpt:1.2 Tue Apr 17 20:17:20 2007
+++ php-src/sapi/cgi/tests/006.phpt Thu Aug 14 20:04:59 2008
@@ -42,7 +42,7 @@
file_put_contents($filename, $code);
-var_dump(`$php -n -l $filename 2/dev/null`);
+var_dump(`$php -l $filename 2/dev/null`);
@unlink($filename);
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/007.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/sapi/cgi/tests/007.phpt
diff -u php-src/sapi/cgi/tests/007.phpt:1.1 php-src/sapi/cgi/tests/007.phpt:1.2
--- php-src/sapi/cgi/tests/007.phpt:1.1 Tue Apr 17 19:48:22 2007
+++ php-src/sapi/cgi/tests/007.phpt Thu Aug 14 20:04:59 2008
@@ -10,7 +10,7 @@
reset_env_vars();
var_dump(`$php -n -f some.php -f some.php`);
-var_dump(`$php -s -w -l`);
+var_dump(`$php -n -s -w -l`);
echo Done\n;
?
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/include.inc?r1=1.2r2=1.3diff_format=u
Index: php-src/sapi/cgi/tests/include.inc
diff -u php-src/sapi/cgi/tests/include.inc:1.2
php-src/sapi/cgi/tests/include.inc:1.3
--- php-src/sapi/cgi/tests/include.inc:1.2 Sun May 27 19:22:24 2007
+++ php-src/sapi/cgi/tests/include.inc Thu Aug 14 20:04:59 2008
@@ -8,7 +8,7 @@
$cgi = false;
if (file_exists($php) is_executable($php)) {
- $version = `$php -v`;
+ $version = `$php -n -v`;
if (strstr($version, (cli))) {
/* that's cli */
$cli = true;
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/009.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/sapi/cli/tests/009.phpt
diff -u php-src/sapi/cli/tests/009.phpt:1.4 php-src/sapi/cli/tests/009.phpt:1.5
--- php-src/sapi/cli/tests/009.phpt:1.4 Thu Apr 19 07:00:57 2007
+++ php-src/sapi/cli/tests/009.phpt Thu Aug 14 20:05:00 2008
@@ -7,15 +7,12 @@
$php = getenv('TEST_PHP_EXECUTABLE');
-var_dump(`$php -n -c -r echo hello;`);
var_dump(`$php -n -a -r echo hello;`);
var_dump(`$php -n -r echo hello; -a`);
echo Done\n;
?
--EXPECTF--
-string(55) You cannot use both -n and -c switch. Use -h for help.
-
string(57) Either execute direct code, process stdin or use a file.
string(57) Either execute direct code, process stdin or use a file.
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/015.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/sapi/cli/tests/015.phpt
diff -u php-src/sapi/cli/tests/015.phpt:1.4 php-src/sapi/cli/tests/015.phpt:1.5
--- php-src/sapi/cli/tests/015.phpt:1.4 Fri Jun 1 22:19:20 2007
+++ php-src/sapi/cli/tests/015.phpt Thu Aug 14 20:05:00 2008
@@ -13,10 +13,10 @@
$php = getenv('TEST_PHP_EXECUTABLE');
-echo `$php --version | grep built:`;
-echo `echo ?php print_r(\\\$argv); | $php -- foo bar baz`, \n;
-echo `$php --version foo bar baz | grep built:`;
-echo `$php --notexisting foo bar baz | grep Usage:`;
+echo `$php -n --version | grep built:`;
+echo `echo ?php print_r(\\\$argv); | $php -n -- foo bar baz`, \n;
+echo `$php -n --version foo bar baz | grep built:`;
+echo `$php -n --notexisting foo bar baz | grep Usage:`;
echo Done\n;
?
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/021.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/sapi/cli/tests/021.phpt
diff -u php-src/sapi/cli/tests/021.phpt:1.2 php-src/sapi/cli/tests/021.phpt:1.3
--- php-src/sapi/cli/tests/021.phpt:1.2 Sun Jul 6 17:00:00 2008
+++ php-src/sapi/cli/tests/021.phpt Thu Aug 14 20:05:00 2008
@@ -14,7 +14,7 @@
$filename = __DIR__.'/021.tmp.php';
-$script = #!$php\n.
+$script = #!$php -n\n.
ola\n.
?php echo 1+1,'\n';\n.
?\n.
--
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/strings nl2br_error.phpt
janiThu Aug 14 20:33:21 2008 UTC Modified files: /php-src/ext/standard/tests/strings nl2br_error.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_error.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/strings/nl2br_error.phpt diff -u php-src/ext/standard/tests/strings/nl2br_error.phpt:1.2 php-src/ext/standard/tests/strings/nl2br_error.phpt:1.3 --- php-src/ext/standard/tests/strings/nl2br_error.phpt:1.2 Fri Oct 5 18:47:47 2007 +++ php-src/ext/standard/tests/strings/nl2br_error.phpt Thu Aug 14 20:33:20 2008 @@ -7,27 +7,28 @@ * Source code: ext/standard/string.c */ -echo *** Testing nl2br() : error conditions ***; +echo *** Testing nl2br() : error conditions ***\n; // Zero arguments echo \n-- Testing nl2br() function with Zero arguments --; var_dump( nl2br() ); -// Test nl2br with one more than the expected number of arguments +//Test nl2br with one more than the expected number of arguments echo \n-- Testing nl2br() function with more than expected no. of arguments --; $str = 'string_val'; $extra_arg = 10; -var_dump( nl2br($str, $extra_arg) ); +var_dump( nl2br($str, true, $extra_arg) ); echo Done; ? --EXPECTF-- *** Testing nl2br() : error conditions *** + -- Testing nl2br() function with Zero arguments -- -Warning: nl2br() expects exactly 1 parameter, 0 given in %s on line %d +Warning: nl2br() expects at least 1 parameter, 0 given in %s on line %d NULL -- Testing nl2br() function with more than expected no. of arguments -- -Warning: nl2br() expects exactly 1 parameter, 2 given in %s on line %d +Warning: nl2br() expects at most 2 parameters, 3 given in %s on line %d NULL Done -- 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/strings nl2br_error.phpt
janiThu Aug 14 20:33:35 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings nl2br_error.phpt Log: MFH: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/nl2br_error.phpt?r1=1.1.4.3r2=1.1.4.4diff_format=u Index: php-src/ext/standard/tests/strings/nl2br_error.phpt diff -u php-src/ext/standard/tests/strings/nl2br_error.phpt:1.1.4.3 php-src/ext/standard/tests/strings/nl2br_error.phpt:1.1.4.4 --- php-src/ext/standard/tests/strings/nl2br_error.phpt:1.1.4.3 Wed Jun 25 12:16:16 2008 +++ php-src/ext/standard/tests/strings/nl2br_error.phpt Thu Aug 14 20:33:35 2008 @@ -17,7 +17,7 @@ echo \n-- Testing nl2br() function with more than expected no. of arguments --; $str = 'string_val'; $extra_arg = 10; -var_dump( nl2br($str, $extra_arg) ); +var_dump( nl2br($str, true, $extra_arg) ); echo Done; ? @@ -25,10 +25,10 @@ *** Testing nl2br() : error conditions *** -- Testing nl2br() function with Zero arguments -- -Warning: nl2br() expects exactly 1 parameter, 0 given in %s on line %d +Warning: nl2br() expects at least 1 parameter, 0 given in %s on line %d NULL -- Testing nl2br() function with more than expected no. of arguments -- -Warning: nl2br() expects exactly 1 parameter, 2 given in %s on line %d +Warning: nl2br() expects at most 2 parameters, 3 given in %s on line %d NULL Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi/tests 006.phpt
janiThu Aug 14 20:50:57 2008 UTC Modified files: /php-src/sapi/cgi/tests 006.phpt Log: - Fix test http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/006.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/sapi/cgi/tests/006.phpt diff -u php-src/sapi/cgi/tests/006.phpt:1.3 php-src/sapi/cgi/tests/006.phpt:1.4 --- php-src/sapi/cgi/tests/006.phpt:1.3 Thu Aug 14 20:04:59 2008 +++ php-src/sapi/cgi/tests/006.phpt Thu Aug 14 20:50:56 2008 @@ -42,7 +42,7 @@ file_put_contents($filename, $code); -var_dump(`$php -l $filename 2/dev/null`); +var_dump(`$php -n -l $filename 2/dev/null`); @unlink($filename); -- 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) /sapi/cgi/tests 005.phpt 006.phpt 007.phpt include.inc /sapi/cli/tests 009.phpt 015.phpt 021.phpt
janiThu Aug 14 20:51:35 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cgi/tests 005.phpt 006.phpt 007.phpt include.inc
/php-src/sapi/cli/tests 009.phpt 015.phpt 021.phpt
Log:
fix tests
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/005.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u
Index: php-src/sapi/cgi/tests/005.phpt
diff -u php-src/sapi/cgi/tests/005.phpt:1.1.2.2
php-src/sapi/cgi/tests/005.phpt:1.1.2.2.2.1
--- php-src/sapi/cgi/tests/005.phpt:1.1.2.2 Tue Apr 17 19:49:26 2007
+++ php-src/sapi/cgi/tests/005.phpt Thu Aug 14 20:51:35 2008
@@ -10,15 +10,12 @@
$php = get_cgi_path();
reset_env_vars();
-var_dump(`$php -n -c -f 'wrong'`);
var_dump(`$php -n -a -f 'wrong'`);
var_dump(`$php -n -f 'wrong' -a`);
echo Done\n;
?
--EXPECTF--
-string(55) You cannot use both -n and -c switch. Use -h for help.
-
string(51) No input file specified.
Interactive mode enabled
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/006.phpt?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u
Index: php-src/sapi/cgi/tests/006.phpt
diff -u php-src/sapi/cgi/tests/006.phpt:1.1.2.3
php-src/sapi/cgi/tests/006.phpt:1.1.2.3.2.1
--- php-src/sapi/cgi/tests/006.phpt:1.1.2.3 Tue Apr 17 20:17:25 2007
+++ php-src/sapi/cgi/tests/006.phpt Thu Aug 14 20:51:35 2008
@@ -42,7 +42,7 @@
file_put_contents($filename, $code);
-var_dump(`$php -n -l $filename 2/dev/null`);
+var_dump(`$php -l $filename 2/dev/null`);
@unlink($filename);
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/007.phpt?r1=1.1.2.2.2.1r2=1.1.2.2.2.2diff_format=u
Index: php-src/sapi/cgi/tests/007.phpt
diff -u php-src/sapi/cgi/tests/007.phpt:1.1.2.2.2.1
php-src/sapi/cgi/tests/007.phpt:1.1.2.2.2.2
--- php-src/sapi/cgi/tests/007.phpt:1.1.2.2.2.1 Sun Mar 16 21:06:54 2008
+++ php-src/sapi/cgi/tests/007.phpt Thu Aug 14 20:51:35 2008
@@ -10,7 +10,7 @@
reset_env_vars();
var_dump(`$php -n -f some.php -f some.php`);
-var_dump(`$php -s -w -l`);
+var_dump(`$php -n -s -w -l`);
?
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/include.inc?r1=1.1.2.3r2=1.1.2.3.2.1diff_format=u
Index: php-src/sapi/cgi/tests/include.inc
diff -u php-src/sapi/cgi/tests/include.inc:1.1.2.3
php-src/sapi/cgi/tests/include.inc:1.1.2.3.2.1
--- php-src/sapi/cgi/tests/include.inc:1.1.2.3 Sun May 27 19:23:09 2007
+++ php-src/sapi/cgi/tests/include.inc Thu Aug 14 20:51:35 2008
@@ -8,7 +8,7 @@
$cgi = false;
if (file_exists($php) is_executable($php)) {
- $version = `$php -v`;
+ $version = `$php -n -v`;
if (strstr($version, (cli))) {
/* that's cli */
$cli = true;
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/009.phpt?r1=1.1.2.5r2=1.1.2.5.2.1diff_format=u
Index: php-src/sapi/cli/tests/009.phpt
diff -u php-src/sapi/cli/tests/009.phpt:1.1.2.5
php-src/sapi/cli/tests/009.phpt:1.1.2.5.2.1
--- php-src/sapi/cli/tests/009.phpt:1.1.2.5 Thu Apr 19 07:00:40 2007
+++ php-src/sapi/cli/tests/009.phpt Thu Aug 14 20:51:35 2008
@@ -7,15 +7,12 @@
$php = getenv('TEST_PHP_EXECUTABLE');
-var_dump(`$php -n -c -r echo hello;`);
var_dump(`$php -n -a -r echo hello;`);
var_dump(`$php -n -r echo hello; -a`);
echo Done\n;
?
--EXPECTF--
-You cannot use both -n and -c switch. Use -h for help.
-NULL
Either execute direct code, process stdin or use a file.
NULL
Either execute direct code, process stdin or use a file.
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/015.phpt?r1=1.1.2.5r2=1.1.2.5.2.1diff_format=u
Index: php-src/sapi/cli/tests/015.phpt
diff -u php-src/sapi/cli/tests/015.phpt:1.1.2.5
php-src/sapi/cli/tests/015.phpt:1.1.2.5.2.1
--- php-src/sapi/cli/tests/015.phpt:1.1.2.5 Fri Jun 1 22:18:56 2007
+++ php-src/sapi/cli/tests/015.phpt Thu Aug 14 20:51:35 2008
@@ -13,10 +13,10 @@
$php = getenv('TEST_PHP_EXECUTABLE');
-echo `$php --version | grep built:`;
-echo `echo ?php print_r(\\\$argv); | $php -- foo bar baz`, \n;
-echo `$php --version foo bar baz | grep built:`;
-echo `$php --notexisting foo bar baz | grep Usage:`;
+echo `$php -n --version | grep built:`;
+echo `echo ?php print_r(\\\$argv); | $php -n -- foo bar baz`, \n;
+echo `$php -n --version foo bar baz | grep built:`;
+echo `$php -n --notexisting foo bar baz | grep Usage:`;
echo Done\n;
?
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/021.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/sapi/cli/tests/021.phpt
diff -u php-src/sapi/cli/tests/021.phpt:1.1.2.1
php-src/sapi/cli/tests/021.phpt:1.1.2.2
--- php-src/sapi/cli/tests/021.phpt:1.1.2.1 Sun Jul 6 16:59:39 2008
+++ php-src/sapi/cli/tests/021.phpt Thu Aug 14 20:51:35 2008
@@ -14,7 +14,7 @@
$filename = __DIR__.'/021.tmp.php';
-$script = #!$php\n.
+$script = #!$php -n\n.
ola\n.
?php echo 1+1,'\n';\n.
?\n.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit:
[PHP-CVS] cvs: php-src(PHP_5_2) / run-tests.php
janiThu Aug 14 20:53:00 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-srcrun-tests.php
Log:
- Nuke annoying errors already silenced elsewhere too
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.46r2=1.226.2.37.2.47diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.46
php-src/run-tests.php:1.226.2.37.2.47
--- php-src/run-tests.php:1.226.2.37.2.46 Wed Jul 23 13:43:05 2008
+++ php-src/run-tests.php Thu Aug 14 20:53:00 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.46 2008/07/23 13:43:05 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.47 2008/08/14 20:53:00 jani Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -224,7 +224,7 @@
$php_cgi_info = '';
}
@unlink($info_file);
- define('TESTED_PHP_VERSION', `$php -r echo PHP_VERSION;`);
+ define('TESTED_PHP_VERSION', `$php -n -r echo PHP_VERSION;`);
// load list of enabled extensions
save_text($info_file, '?php echo join(,,get_loaded_extensions());
?');
@@ -428,7 +428,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.46
$'.\n;
+ echo '$Revision: 1.226.2.37.2.47
$'.\n;
exit(1);
case 'u':
@@ -786,7 +786,7 @@
}
$failed_tests_data .= $sep . PHPINFO . $sep;
- $failed_tests_data .= shell_exec($php.' -dhtml_errors=0 -i');
+ $failed_tests_data .= shell_exec($php . '
-ddisplay_errors=stderr -dhtml_errors=0 -i 2 /dev/null');
if ($just_save_results || !mail_qa_team($failed_tests_data,
$compression, $status)) {
file_put_contents($output_file, $failed_tests_data);
@@ -1387,7 +1387,7 @@
return 'BORKED';
}
save_text($tmp_post, $request);
- $cmd = $php$pass_options$ini_settings -f \$test_file\ 21
$tmp_post;
+ $cmd = $php $pass_options $ini_settings -f \$test_file\ 21
$tmp_post;
} elseif (array_key_exists('POST', $section_text)
!empty($section_text['POST'])) {
$post = trim($section_text['POST']);
@@ -1407,7 +1407,7 @@
$env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
$env['CONTENT_LENGTH'] = $content_length;
- $cmd = $php$pass_options$ini_settings -f \$test_file\ 21
$tmp_post;
+ $cmd = $php $pass_options $ini_settings -f \$test_file\ 21
$tmp_post;
} else {
@@ -1415,7 +1415,7 @@
$env['CONTENT_TYPE'] = '';
$env['CONTENT_LENGTH'] = '';
- $cmd = $php$pass_options$ini_settings -f \$test_file\ $args
21;
+ $cmd = $php $pass_options $ini_settings -f \$test_file\
$args 21;
}
if ($leak_check) {
--
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) /sapi/cgi/tests 005.phpt 007.phpt include.inc /sapi/cli/tests 009.phpt 015.phpt
janiThu Aug 14 20:53:32 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi/tests 005.phpt 007.phpt include.inc
/php-src/sapi/cli/tests 009.phpt 015.phpt
Log:
MFH: fix tests
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/005.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/sapi/cgi/tests/005.phpt
diff -u php-src/sapi/cgi/tests/005.phpt:1.1.2.2
php-src/sapi/cgi/tests/005.phpt:1.1.2.3
--- php-src/sapi/cgi/tests/005.phpt:1.1.2.2 Tue Apr 17 19:49:26 2007
+++ php-src/sapi/cgi/tests/005.phpt Thu Aug 14 20:53:31 2008
@@ -10,15 +10,12 @@
$php = get_cgi_path();
reset_env_vars();
-var_dump(`$php -n -c -f 'wrong'`);
var_dump(`$php -n -a -f 'wrong'`);
var_dump(`$php -n -f 'wrong' -a`);
echo Done\n;
?
--EXPECTF--
-string(55) You cannot use both -n and -c switch. Use -h for help.
-
string(51) No input file specified.
Interactive mode enabled
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/007.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/sapi/cgi/tests/007.phpt
diff -u php-src/sapi/cgi/tests/007.phpt:1.1.2.2
php-src/sapi/cgi/tests/007.phpt:1.1.2.3
--- php-src/sapi/cgi/tests/007.phpt:1.1.2.2 Tue Apr 17 19:49:26 2007
+++ php-src/sapi/cgi/tests/007.phpt Thu Aug 14 20:53:31 2008
@@ -10,7 +10,7 @@
reset_env_vars();
var_dump(`$php -n -f some.php -f some.php`);
-var_dump(`$php -s -w -l`);
+var_dump(`$php -n -s -w -l`);
echo Done\n;
?
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/include.inc?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/sapi/cgi/tests/include.inc
diff -u php-src/sapi/cgi/tests/include.inc:1.1.2.3
php-src/sapi/cgi/tests/include.inc:1.1.2.4
--- php-src/sapi/cgi/tests/include.inc:1.1.2.3 Sun May 27 19:23:09 2007
+++ php-src/sapi/cgi/tests/include.inc Thu Aug 14 20:53:31 2008
@@ -8,7 +8,7 @@
$cgi = false;
if (file_exists($php) is_executable($php)) {
- $version = `$php -v`;
+ $version = `$php -n -v`;
if (strstr($version, (cli))) {
/* that's cli */
$cli = true;
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/009.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/sapi/cli/tests/009.phpt
diff -u php-src/sapi/cli/tests/009.phpt:1.1.2.5
php-src/sapi/cli/tests/009.phpt:1.1.2.6
--- php-src/sapi/cli/tests/009.phpt:1.1.2.5 Thu Apr 19 07:00:40 2007
+++ php-src/sapi/cli/tests/009.phpt Thu Aug 14 20:53:31 2008
@@ -7,15 +7,12 @@
$php = getenv('TEST_PHP_EXECUTABLE');
-var_dump(`$php -n -c -r echo hello;`);
var_dump(`$php -n -a -r echo hello;`);
var_dump(`$php -n -r echo hello; -a`);
echo Done\n;
?
--EXPECTF--
-You cannot use both -n and -c switch. Use -h for help.
-NULL
Either execute direct code, process stdin or use a file.
NULL
Either execute direct code, process stdin or use a file.
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/015.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/sapi/cli/tests/015.phpt
diff -u php-src/sapi/cli/tests/015.phpt:1.1.2.5
php-src/sapi/cli/tests/015.phpt:1.1.2.6
--- php-src/sapi/cli/tests/015.phpt:1.1.2.5 Fri Jun 1 22:18:56 2007
+++ php-src/sapi/cli/tests/015.phpt Thu Aug 14 20:53:31 2008
@@ -13,10 +13,10 @@
$php = getenv('TEST_PHP_EXECUTABLE');
-echo `$php --version | grep built:`;
-echo `echo ?php print_r(\\\$argv); | $php -- foo bar baz`, \n;
-echo `$php --version foo bar baz | grep built:`;
-echo `$php --notexisting foo bar baz | grep Usage:`;
+echo `$php -n --version | grep built:`;
+echo `echo ?php print_r(\\\$argv); | $php -n -- foo bar baz`, \n;
+echo `$php -n --version foo bar baz | grep built:`;
+echo `$php -n --notexisting foo bar baz | grep Usage:`;
echo Done\n;
?
--
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) / run-tests.php
janiThu Aug 14 20:53:57 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Silencio for some unnecessary errors
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.42r2=1.226.2.37.2.35.2.43diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.42
php-src/run-tests.php:1.226.2.37.2.35.2.43
--- php-src/run-tests.php:1.226.2.37.2.35.2.42 Tue Aug 5 16:25:42 2008
+++ php-src/run-tests.php Thu Aug 14 20:53:56 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.42 2008/08/05 16:25:42 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.43 2008/08/14 20:53:56 jani Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -389,7 +389,7 @@
}
$failed_tests_data .= $sep . PHPINFO . $sep;
- $failed_tests_data .= shell_exec($php . '
-dhtml_errors=0 -i');
+ $failed_tests_data .= shell_exec($php . '
-ddisplay_errors=stderr -dhtml_errors=0 -i 2 /dev/null');
if ($just_save_results ||
!mail_qa_team($failed_tests_data, $compression, $status)) {
file_put_contents($output_file,
$failed_tests_data);
@@ -608,7 +608,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.42
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.43
$' . \n;
exit(1);
default:
@@ -1560,7 +1560,7 @@
}
save_text($tmp_post, $request);
- $cmd = $php$pass_options$ini_settings -f \$test_file\ 21
$tmp_post;
+ $cmd = $php $pass_options $ini_settings -f \$test_file\ 21
$tmp_post;
} else if (array_key_exists('POST', $section_text)
!empty($section_text['POST'])) {
@@ -1581,7 +1581,7 @@
$env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
$env['CONTENT_LENGTH'] = $content_length;
- $cmd = $php$pass_options$ini_settings -f \$test_file\ 21
$tmp_post;
+ $cmd = $php $pass_options $ini_settings -f \$test_file\ 21
$tmp_post;
} else {
@@ -1589,7 +1589,7 @@
$env['CONTENT_TYPE'] = '';
$env['CONTENT_LENGTH'] = '';
- $cmd = $php$pass_options$ini_settings -f \$test_file\ $args
21;
+ $cmd = $php $pass_options $ini_settings -f \$test_file\
$args 21;
}
if ($leak_check) {
--
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/gd/tests imageloadfont_invalid.phpt
janiThu Aug 14 20:55:31 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd/tests imageloadfont_invalid.phpt Log: do not leave crap behind http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/imageloadfont_invalid.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/gd/tests/imageloadfont_invalid.phpt diff -u php-src/ext/gd/tests/imageloadfont_invalid.phpt:1.1.4.2 php-src/ext/gd/tests/imageloadfont_invalid.phpt:1.1.4.3 --- php-src/ext/gd/tests/imageloadfont_invalid.phpt:1.1.4.2 Thu Jul 17 22:58:23 2008 +++ php-src/ext/gd/tests/imageloadfont_invalid.phpt Thu Aug 14 20:55:31 2008 @@ -17,6 +17,7 @@ $font = imageloadfont($filename); $black = imagecolorallocate($image, 0, 0, 0); imagestring($image, $font, 0, 0, Hello, $black); +unlink($filename); ? --EXPECTF-- Warning: imageloadfont(): gd warning: product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully -- 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) /sapi/cli/tests 021.phpt
janiThu Aug 14 20:57:13 2008 UTC Added files: (Branch: PHP_5_2) /php-src/sapi/cli/tests 021.phpt Log: MFH: fix tests, add missing test http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/021.phpt?view=markuprev=1.1 Index: php-src/sapi/cli/tests/021.phpt +++ php-src/sapi/cli/tests/021.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/pcre php_pcre.c /ext/pcre/tests bug44925.phpt
I think this change is too intrusive for a bug fix only branch. This
introduces a little BC break (to better match the manual description), so I
think it should only go with 5.3.
Nuno
- Original Message -
Doesn't this bug exist in PHP_5_2 branch? That's not (AFAIK) dead branch
yet so bug fixes MUST go there too.
In which case you move that NEWS entry to the PHP_5_2 NEWS..
--Jani
Nuno Lopes [EMAIL PROTECTED] kirjoitti:
nlopess Thu Aug 14 13:12:42 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pcre/tests bug44925.phpt Modified files:
/php-src NEWS /php-src/ext/pcre php_pcre.c Log:
Fixed bug #44925 (preg_grep() modifies input array)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.268r2=1.2027.2.547.2.965.2.269diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.268
php-src/NEWS:1.2027.2.547.2.965.2.269
--- php-src/NEWS:1.2027.2.547.2.965.2.268 Thu Aug 14 10:13:23 2008
+++ php-src/NEWS Thu Aug 14 13:12:42 2008
@@ -30,6 +30,7 @@
- Fixed bug #45545 (DateInterval has 4 char limitation for ISO
durations).
(Derick)
- Fixed bug #45044 (relative paths not resolved correctly). (Dmitry)
+- Fixed bug #44925 (preg_grep() modifies input array). (Nuno)
- Fixed bug #44100 (Inconsistent handling of static array declarations
with
duplicate keys). (Dmitry)
- Fixed bug #43817 (opendir() fails on Windows directories with parent
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.19r2=1.168.2.9.2.21.2.20diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.19
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.20
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.19 Sat Aug 2 04:46:06
2008
+++ php-src/ext/pcre/php_pcre.c Thu Aug 14 13:12:42 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.19 2008/08/02 04:46:06 felipe Exp
$ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.20 2008/08/14 13:12:42 nlopess Exp
$ */
#include php.h
#include php_ini.h
@@ -1743,13 +1743,30 @@
/* Go through the input array */
zend_hash_internal_pointer_reset(Z_ARRVAL_P(input));
- while(zend_hash_get_current_data(Z_ARRVAL_P(input), (void **)entry) ==
SUCCESS) {
+ while (zend_hash_get_current_data(Z_ARRVAL_P(input), (void **)entry)
== SUCCESS) {
+ zend_bool is_copy;
+ zval *str;
+
+ switch (Z_TYPE_PP(entry)) {
+ case IS_STRING:
+ is_copy = 0;
+ str = *entry;
+ break;
+
+ default:
+ is_copy = 1;
- convert_to_string_ex(entry);
+ ALLOC_ZVAL(str);
+ Z_ADDREF_PP(entry); /* the function below decreases the ref counting */
+ COPY_PZVAL_TO_ZVAL(*str, *entry);
+
+ convert_to_string(str);
+ break;
+ }
/* Perform the match */
- count = pcre_exec(pce-re, extra, Z_STRVAL_PP(entry),
- Z_STRLEN_PP(entry), 0,
+ count = pcre_exec(pce-re, extra, Z_STRVAL_P(str),
+ Z_STRLEN_P(str), 0,
0, offsets, size_offsets);
/* Check for too many substrings condition. */
@@ -1762,25 +1779,30 @@
}
/* If the entry fits our requirements */
- if ((count 0 !invert) ||
- (count == PCRE_ERROR_NOMATCH invert)) {
- Z_ADDREF_PP(entry);
+ if ((count 0 !invert) || (count == PCRE_ERROR_NOMATCH invert))
{
+
+ if (!is_copy) {
+ SEPARATE_ARG_IF_REF(str);
+ }
/* Add to return array */
switch (zend_hash_get_current_key(Z_ARRVAL_P(input), string_key,
num_key, 0))
{
case HASH_KEY_IS_STRING:
zend_hash_update(Z_ARRVAL_P(return_value), string_key,
- strlen(string_key)+1, entry, sizeof(zval *), NULL);
+ strlen(string_key)+1, str, sizeof(zval *), NULL);
break;
case HASH_KEY_IS_LONG:
- zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, entry,
+ zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, str,
sizeof(zval *), NULL);
break;
}
+ } else if (is_copy) {
+ zval_dtor(str);
+ FREE_ZVAL(str);
}
- +
zend_hash_move_forward(Z_ARRVAL_P(input));
}
zend_hash_internal_pointer_reset(Z_ARRVAL_P(input));
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug44925.phpt?view=markuprev=1.1
Index: php-src/ext/pcre/tests/bug44925.phpt
+++ php-src/ext/pcre/tests/bug44925.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/basic bug20539.phpt
janiThu Aug 14 21:53:53 2008 UTC Modified files: /php-src/tests/basicbug20539.phpt Log: - Fix test to use same path as test is as session.save_path to prevent permission errors. http://cvs.php.net/viewvc.cgi/php-src/tests/basic/bug20539.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/tests/basic/bug20539.phpt diff -u php-src/tests/basic/bug20539.phpt:1.3 php-src/tests/basic/bug20539.phpt:1.4 --- php-src/tests/basic/bug20539.phpt:1.3 Fri Jul 8 07:48:57 2005 +++ php-src/tests/basic/bug20539.phpt Thu Aug 14 21:53:53 2008 @@ -3,9 +3,11 @@ --INI-- session.auto_start=1 session.save_handler=files +session.save_path=./tests/basic/ --FILE-- ?php print good :)\n; + unlink(dirname(__FILE__) . '/sess_' . session_id()); ? --EXPECT-- good :) -- 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) /tests/basic bug20539.phpt
janiThu Aug 14 21:54:01 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/tests/basicbug20539.phpt Log: MFH:fix test http://cvs.php.net/viewvc.cgi/php-src/tests/basic/bug20539.phpt?r1=1.3r2=1.3.6.1diff_format=u Index: php-src/tests/basic/bug20539.phpt diff -u php-src/tests/basic/bug20539.phpt:1.3 php-src/tests/basic/bug20539.phpt:1.3.6.1 --- php-src/tests/basic/bug20539.phpt:1.3 Fri Jul 8 07:48:57 2005 +++ php-src/tests/basic/bug20539.phpt Thu Aug 14 21:54:01 2008 @@ -3,9 +3,11 @@ --INI-- session.auto_start=1 session.save_handler=files +session.save_path=./tests/basic/ --FILE-- ?php print good :)\n; + unlink(dirname(__FILE__) . '/sess_' . session_id()); ? --EXPECT-- good :) -- 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) /tests/basic bug20539.phpt
janiThu Aug 14 21:56:13 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/tests/basicbug20539.phpt Log: MFH:fix test http://cvs.php.net/viewvc.cgi/php-src/tests/basic/bug20539.phpt?r1=1.3r2=1.3.4.1diff_format=u Index: php-src/tests/basic/bug20539.phpt diff -u php-src/tests/basic/bug20539.phpt:1.3 php-src/tests/basic/bug20539.phpt:1.3.4.1 --- php-src/tests/basic/bug20539.phpt:1.3 Fri Jul 8 07:48:57 2005 +++ php-src/tests/basic/bug20539.phpt Thu Aug 14 21:56:13 2008 @@ -3,9 +3,11 @@ --INI-- session.auto_start=1 session.save_handler=files +session.save_path=./tests/basic/ --FILE-- ?php print good :)\n; + unlink(dirname(__FILE__) . '/sess_' . session_id()); ? --EXPECT-- good :) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 readdir.h time.c
kalle Thu Aug 14 23:21:33 2008 UTC Modified files: /php-src/win32 readdir.h time.c Log: * Last _WIN32_WINNT macro redef * Include config.w32.h where _WIN32_WINNT was http://cvs.php.net/viewvc.cgi/php-src/win32/readdir.h?r1=1.10r2=1.11diff_format=u Index: php-src/win32/readdir.h diff -u php-src/win32/readdir.h:1.10 php-src/win32/readdir.h:1.11 --- php-src/win32/readdir.h:1.10Fri Dec 1 20:22:11 2006 +++ php-src/win32/readdir.h Thu Aug 14 23:21:32 2008 @@ -7,7 +7,7 @@ * on Windows 95/NT. */ -#define _WIN32_WINNT 0x0400 +#include config.w32.h #include windows.h http://cvs.php.net/viewvc.cgi/php-src/win32/time.c?r1=1.11r2=1.12diff_format=u Index: php-src/win32/time.c diff -u php-src/win32/time.c:1.11 php-src/win32/time.c:1.12 --- php-src/win32/time.c:1.11 Wed Aug 13 22:39:33 2008 +++ php-src/win32/time.cThu Aug 14 23:21:32 2008 @@ -11,7 +11,7 @@ * */ -/* $Id: time.c,v 1.11 2008/08/13 22:39:33 kalle Exp $ */ +/* $Id: time.c,v 1.12 2008/08/14 23:21:32 kalle Exp $ */ /** * @@ -22,6 +22,8 @@ /* Include stuff */ +#include config.w32.h + #include time.h #include unistd.h #include signal.h -- 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/file clearstatcache_001.phpt
janiThu Aug 14 23:25:27 2008 UTC Modified files: /php-src/ext/standard/tests/fileclearstatcache_001.phpt Log: - Fix test: Do not leave your crap behind! http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/clearstatcache_001.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/standard/tests/file/clearstatcache_001.phpt diff -u php-src/ext/standard/tests/file/clearstatcache_001.phpt:1.3 php-src/ext/standard/tests/file/clearstatcache_001.phpt:1.4 --- php-src/ext/standard/tests/file/clearstatcache_001.phpt:1.3 Sun Aug 10 12:06:49 2008 +++ php-src/ext/standard/tests/file/clearstatcache_001.phpt Thu Aug 14 23:25:27 2008 @@ -30,9 +30,6 @@ clearstatcache(true, __FILE__ . _link1); var_dump(realpath(__FILE__ . _link2)); -? ---CLEAN-- -?php @rmdir(__FILE__ . _dir1); @rmdir(__FILE__ . _dir2); @unlink(__FILE__ . _link1); -- 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/file clearstatcache_001.phpt
janiThu Aug 14 23:25:45 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/fileclearstatcache_001.phpt Log: - Fix test: Do not leave your crap behind! http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/clearstatcache_001.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u Index: php-src/ext/standard/tests/file/clearstatcache_001.phpt diff -u php-src/ext/standard/tests/file/clearstatcache_001.phpt:1.1.2.4 php-src/ext/standard/tests/file/clearstatcache_001.phpt:1.1.2.5 --- php-src/ext/standard/tests/file/clearstatcache_001.phpt:1.1.2.4 Sun Aug 10 12:05:00 2008 +++ php-src/ext/standard/tests/file/clearstatcache_001.phpt Thu Aug 14 23:25:44 2008 @@ -30,9 +30,6 @@ clearstatcache(true, __FILE__ . _link1); var_dump(realpath(__FILE__ . _link2)); -? ---CLEAN-- -?php @rmdir(__FILE__ . _dir1); @rmdir(__FILE__ . _dir2); @unlink(__FILE__ . _link1); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/tests dit_002.phpt
janiThu Aug 14 23:27:38 2008 UTC
Modified files:
/php-src/ext/spl/tests dit_002.phpt
Log:
- Skipif: as long as it is an extension, it can be disabled..
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dit_002.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/spl/tests/dit_002.phpt
diff -u php-src/ext/spl/tests/dit_002.phpt:1.2
php-src/ext/spl/tests/dit_002.phpt:1.3
--- php-src/ext/spl/tests/dit_002.phpt:1.2 Sat May 24 14:11:59 2008
+++ php-src/ext/spl/tests/dit_002.phpt Thu Aug 14 23:27:38 2008
@@ -1,5 +1,7 @@
--TEST--
SPL: DirectoryIterator defaults
+--SKIPIF--
+?php if (!extension_loaded(spl) || !extension_loaded('reflection')) print
skip; ?
--FILE--
?php
--
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/spl/tests dit_002.phpt
janiThu Aug 14 23:28:12 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/spl/tests dit_002.phpt
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dit_002.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/spl/tests/dit_002.phpt
diff -u php-src/ext/spl/tests/dit_002.phpt:1.1.2.3
php-src/ext/spl/tests/dit_002.phpt:1.1.2.4
--- php-src/ext/spl/tests/dit_002.phpt:1.1.2.3 Sat May 24 14:10:43 2008
+++ php-src/ext/spl/tests/dit_002.phpt Thu Aug 14 23:28:12 2008
@@ -1,5 +1,7 @@
--TEST--
SPL: DirectoryIterator defaults
+--SKIPIF--
+?php if (!extension_loaded(spl) || !extension_loaded('reflection')) print
skip; ?
--FILE--
?php
@@ -29,7 +31,7 @@
var_dump($obj-getFlags());
if ($isstring) {
$val = $obj-current();
- if (is_string($val)) {
+ if (is_string($val) || is_unicode($val)) {
var_dump(true);
} else {
var_dump($val);
--
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 bug44394_2.phpt
janiThu Aug 14 23:28:48 2008 UTC
Modified files:
/php-src/ext/standard/tests/general_functions bug44394_2.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug44394_2.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug44394_2.phpt
diff -u php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.4
php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.5
--- php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.4Wed Jul
23 10:26:39 2008
+++ php-src/ext/standard/tests/general_functions/bug44394_2.phptThu Aug
14 23:28:47 2008
@@ -8,7 +8,7 @@
?php
ini_set('session.use_trans_sid', 1);
-
+session_save_path(dirname(__FILE__));
session_start();
ob_start();
@@ -23,6 +23,8 @@
ob_end_clean();
+unlink(dirname(__FILE__).'/sess_'.session_id());
+
?
--EXPECTF--
a href='a?q=1PHPSESSID=%sa=b'asd/a
--
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 bug44394_2.phpt
janiThu Aug 14 23:29:13 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions bug44394_2.phpt
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug44394_2.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug44394_2.phpt
diff -u php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.1.2.3
php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.1.2.4
--- php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.1.2.3
Wed Jul 23 10:26:45 2008
+++ php-src/ext/standard/tests/general_functions/bug44394_2.phptThu Aug
14 23:29:13 2008
@@ -8,7 +8,7 @@
?php
ini_set('session.use_trans_sid', 1);
-
+session_save_path(dirname(__FILE__));
session_start();
ob_start();
@@ -23,6 +23,8 @@
ob_end_clean();
+unlink(dirname(__FILE__).'/sess_'.session_id());
+
?
--EXPECTF--
a href='a?q=1PHPSESSID=%sa=b'asd/a
--
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) /win32 readdir.h time.c
kalle Thu Aug 14 23:29:25 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/win32 readdir.h time.c Log: MFH: * Last _WIN32_WINNT macro redef * Include config.w32.h where _WIN32_WINNT was http://cvs.php.net/viewvc.cgi/php-src/win32/readdir.h?r1=1.8.6.2r2=1.8.6.2.2.1diff_format=u Index: php-src/win32/readdir.h diff -u php-src/win32/readdir.h:1.8.6.2 php-src/win32/readdir.h:1.8.6.2.2.1 --- php-src/win32/readdir.h:1.8.6.2 Fri Dec 1 20:17:50 2006 +++ php-src/win32/readdir.h Thu Aug 14 23:29:25 2008 @@ -7,7 +7,7 @@ * on Windows 95/NT. */ -#define _WIN32_WINNT 0x0400 +#include config.w32.h #include windows.h http://cvs.php.net/viewvc.cgi/php-src/win32/time.c?r1=1.10.6.1r2=1.10.6.2diff_format=u Index: php-src/win32/time.c diff -u php-src/win32/time.c:1.10.6.1 php-src/win32/time.c:1.10.6.2 --- php-src/win32/time.c:1.10.6.1 Wed Aug 13 22:40:39 2008 +++ php-src/win32/time.cThu Aug 14 23:29:25 2008 @@ -11,7 +11,7 @@ * */ -/* $Id: time.c,v 1.10.6.1 2008/08/13 22:40:39 kalle Exp $ */ +/* $Id: time.c,v 1.10.6.2 2008/08/14 23:29:25 kalle Exp $ */ /** * @@ -22,6 +22,8 @@ /* Include stuff */ +#include config.w32.h + #include time.h #include unistd.h #include signal.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
janiThu Aug 14 23:29:59 2008 UTC
Modified files:
/php-srcrun-tests.php
Log:
- No unnecessary errors please
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.373r2=1.374diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.373 php-src/run-tests.php:1.374
--- php-src/run-tests.php:1.373 Tue Aug 5 16:25:31 2008
+++ php-src/run-tests.php Thu Aug 14 23:29:59 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.373 2008/08/05 16:25:31 jani Exp $ */
+/* $Id: run-tests.php,v 1.374 2008/08/14 23:29:59 jani Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -389,7 +389,7 @@
}
$failed_tests_data .= $sep . PHPINFO . $sep;
- $failed_tests_data .= shell_exec($php . '
-dhtml_errors=0 -i');
+ $failed_tests_data .= shell_exec($php . '
-ddisplay_errors=stderr -dhtml_errors=0 -i 2 /dev/null');
if ($just_save_results ||
!mail_qa_team($failed_tests_data, $compression, $status)) {
file_put_contents($output_file,
$failed_tests_data);
@@ -608,7 +608,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.373 $' . \n;
+ echo '$Revision: 1.374 $' . \n;
exit(1);
default:
@@ -1560,7 +1560,7 @@
}
save_text($tmp_post, $request);
- $cmd = $php$pass_options$ini_settings -f \$test_file\ 21
$tmp_post;
+ $cmd = $php $pass_options $ini_settings -f \$test_file\ 21
$tmp_post;
} else if (array_key_exists('POST', $section_text)
!empty($section_text['POST'])) {
@@ -1581,7 +1581,7 @@
$env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
$env['CONTENT_LENGTH'] = $content_length;
- $cmd = $php$pass_options$ini_settings -f \$test_file\ 21
$tmp_post;
+ $cmd = $php $pass_options $ini_settings -f \$test_file\ 21
$tmp_post;
} else {
@@ -1589,7 +1589,7 @@
$env['CONTENT_TYPE'] = '';
$env['CONTENT_LENGTH'] = '';
- $cmd = $php$pass_options$ini_settings -f \$test_file\ $args
21;
+ $cmd = $php $pass_options $ini_settings -f \$test_file\
$args 21;
}
if ($leak_check) {
--
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/tests/array array_slice_variation2.phpt array_slice_variation3.phpt /ext/standard/tests/general_functions bug44394_2.phpt
janiThu Aug 14 23:42:01 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/array array_slice_variation2.phpt
array_slice_variation3.phpt
/php-src/ext/standard/tests/general_functions bug44394_2.phpt
Log:
MFH: fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_slice_variation2.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/array/array_slice_variation2.phpt
diff -u php-src/ext/standard/tests/array/array_slice_variation2.phpt:1.1.2.2
php-src/ext/standard/tests/array/array_slice_variation2.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_slice_variation2.phpt:1.1.2.2
Thu Feb 14 11:15:54 2008
+++ php-src/ext/standard/tests/array/array_slice_variation2.phptThu Aug
14 23:42:01 2008
@@ -150,15 +150,7 @@
}
-- Iteration 7 --
-array(4) {
- [one]=
- int(1)
- [0]=
- int(2)
- [three]=
- int(3)
- [1]=
- int(4)
+array(0) {
}
-- Iteration 8 --
@@ -306,4 +298,4 @@
[1]=
int(4)
}
-Done
\ No newline at end of file
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_slice_variation3.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/array/array_slice_variation3.phpt
diff -u php-src/ext/standard/tests/array/array_slice_variation3.phpt:1.1.2.2
php-src/ext/standard/tests/array/array_slice_variation3.phpt:1.1.2.3
--- php-src/ext/standard/tests/array/array_slice_variation3.phpt:1.1.2.2
Thu Feb 14 11:15:53 2008
+++ php-src/ext/standard/tests/array/array_slice_variation3.phptThu Aug
14 23:42:01 2008
@@ -118,7 +118,11 @@
}
-- Iteration 7 --
-array(0) {
+array(2) {
+ [three]=
+ int(3)
+ [0]=
+ int(4)
}
-- Iteration 8 --
@@ -204,4 +208,4 @@
[0]=
int(4)
}
-Done
\ No newline at end of file
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug44394_2.phpt?r1=1.2.2.4r2=1.2.2.5diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug44394_2.phpt
diff -u php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.2.2.4
php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.2.2.5
--- php-src/ext/standard/tests/general_functions/bug44394_2.phpt:1.2.2.4
Wed Jul 23 10:26:55 2008
+++ php-src/ext/standard/tests/general_functions/bug44394_2.phptThu Aug
14 23:42:01 2008
@@ -8,7 +8,7 @@
?php
ini_set('session.use_trans_sid', 1);
-
+session_save_path(dirname(__FILE__));
session_start();
ob_start();
@@ -23,6 +23,8 @@
ob_end_clean();
+unlink(dirname(__FILE__).'/sess_'.session_id());
+
?
--EXPECTF--
a href='a?q=1PHPSESSID=%sa=b'asd/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/file bug26615.phpt bug26938.phpt proc_open01.phpt
janiThu Aug 14 23:43:21 2008 UTC
Modified files:
/php-src/ext/standard/tests/filebug26615.phpt bug26938.phpt
proc_open01.phpt
Log:
- Fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug26615.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/standard/tests/file/bug26615.phpt
diff -u php-src/ext/standard/tests/file/bug26615.phpt:1.5
php-src/ext/standard/tests/file/bug26615.phpt:1.6
--- php-src/ext/standard/tests/file/bug26615.phpt:1.5 Wed Apr 18 14:51:47 2007
+++ php-src/ext/standard/tests/file/bug26615.phpt Thu Aug 14 23:43:21 2008
@@ -7,9 +7,9 @@
$out = array();
$status = -1;
if (substr(PHP_OS, 0, 3) != 'WIN') {
- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r \'for($i=1;$i=5000;$i++) print
$i\n;\' | tr \'\n\' \' \'', $out, $status);
+ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r \'for($i=1;$i=5000;$i++)
print $i\n;\' | tr \'\n\' \' \'', $out, $status);
} else {
- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r for($i=1;$i=5000;$i++) echo
$i,\' \';', $out, $status);
+ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r for($i=1;$i=5000;$i++) echo
$i,\' \';', $out, $status);
}
print_r($out);
?
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug26938.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/file/bug26938.phpt
diff -u php-src/ext/standard/tests/file/bug26938.phpt:1.2
php-src/ext/standard/tests/file/bug26938.phpt:1.3
--- php-src/ext/standard/tests/file/bug26938.phpt:1.2 Wed Apr 18 14:51:47 2007
+++ php-src/ext/standard/tests/file/bug26938.phpt Thu Aug 14 23:43:21 2008
@@ -6,14 +6,14 @@
$status = -1;
$php = getenv('TEST_PHP_EXECUTABLE');
if (substr(PHP_OS, 0, 3) != 'WIN') {
- exec($php . ' -r \''
+ exec($php . ' -n -r \''
. '$lengths = array(10,2,1,5,1,3);'
. 'foreach($lengths as $length) {'
. ' for($i=0;$i$length;$i++) print chr(65+$i % 27);'
. ' print \n;'
. '}\'', $out, $status);
} else {
- exec($php . ' -r '
+ exec($php . ' -n -r '
. '$lengths = array(10,2,1,5,1,3);'
. 'foreach($lengths as $length) {'
. ' for($i=0;$i$length;$i++) print chr(65+$i % 27);'
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/proc_open01.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/standard/tests/file/proc_open01.phpt
diff -u php-src/ext/standard/tests/file/proc_open01.phpt:1.5
php-src/ext/standard/tests/file/proc_open01.phpt:1.6
--- php-src/ext/standard/tests/file/proc_open01.phpt:1.5Fri Mar 2
18:54:41 2007
+++ php-src/ext/standard/tests/file/proc_open01.phptThu Aug 14 23:43:21 2008
@@ -9,7 +9,7 @@
die(no php executable defined);
}
$proc = proc_open(
- $php,
+ $php -n,
array(0 = array('pipe', 'r'), 1 = array('pipe', 'w')),
$pipes
);
--
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/file bug26615.phpt bug26938.phpt proc_open01.phpt
janiThu Aug 14 23:44:30 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/filebug26615.phpt bug26938.phpt
proc_open01.phpt
Log:
MFH: fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug26615.phpt?r1=1.4.4.1r2=1.4.4.1.2.1diff_format=u
Index: php-src/ext/standard/tests/file/bug26615.phpt
diff -u php-src/ext/standard/tests/file/bug26615.phpt:1.4.4.1
php-src/ext/standard/tests/file/bug26615.phpt:1.4.4.1.2.1
--- php-src/ext/standard/tests/file/bug26615.phpt:1.4.4.1 Wed Apr 18
14:51:29 2007
+++ php-src/ext/standard/tests/file/bug26615.phpt Thu Aug 14 23:44:29 2008
@@ -7,9 +7,9 @@
$out = array();
$status = -1;
if (substr(PHP_OS, 0, 3) != 'WIN') {
- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r \'for($i=1;$i=5000;$i++) print
$i\n;\' | tr \'\n\' \' \'', $out, $status);
+ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r \'for($i=1;$i=5000;$i++)
print $i\n;\' | tr \'\n\' \' \'', $out, $status);
} else {
- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r for($i=1;$i=5000;$i++) echo
$i,\' \';', $out, $status);
+ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r for($i=1;$i=5000;$i++) echo
$i,\' \';', $out, $status);
}
print_r($out);
?
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug26938.phpt?r1=1.1.8.1r2=1.1.8.1.2.1diff_format=u
Index: php-src/ext/standard/tests/file/bug26938.phpt
diff -u php-src/ext/standard/tests/file/bug26938.phpt:1.1.8.1
php-src/ext/standard/tests/file/bug26938.phpt:1.1.8.1.2.1
--- php-src/ext/standard/tests/file/bug26938.phpt:1.1.8.1 Wed Apr 18
14:51:29 2007
+++ php-src/ext/standard/tests/file/bug26938.phpt Thu Aug 14 23:44:29 2008
@@ -6,14 +6,14 @@
$status = -1;
$php = getenv('TEST_PHP_EXECUTABLE');
if (substr(PHP_OS, 0, 3) != 'WIN') {
- exec($php . ' -r \''
+ exec($php . ' -n -r \''
. '$lengths = array(10,2,1,5,1,3);'
. 'foreach($lengths as $length) {'
. ' for($i=0;$i$length;$i++) print chr(65+$i % 27);'
. ' print \n;'
. '}\'', $out, $status);
} else {
- exec($php . ' -r '
+ exec($php . ' -n -r '
. '$lengths = array(10,2,1,5,1,3);'
. 'foreach($lengths as $length) {'
. ' for($i=0;$i$length;$i++) print chr(65+$i % 27);'
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/proc_open01.phpt?r1=1.3.4.1.2.1r2=1.3.4.1.2.1.2.1diff_format=u
Index: php-src/ext/standard/tests/file/proc_open01.phpt
diff -u php-src/ext/standard/tests/file/proc_open01.phpt:1.3.4.1.2.1
php-src/ext/standard/tests/file/proc_open01.phpt:1.3.4.1.2.1.2.1
--- php-src/ext/standard/tests/file/proc_open01.phpt:1.3.4.1.2.1Fri Mar
2 18:54:13 2007
+++ php-src/ext/standard/tests/file/proc_open01.phptThu Aug 14 23:44:29 2008
@@ -9,7 +9,7 @@
die(no php executable defined);
}
$proc = proc_open(
- $php,
+ $php -n,
array(0 = array('pipe', 'r'), 1 = array('pipe', 'w')),
$pipes
);
--
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/tests/file bug26615.phpt bug26938.phpt proc_open01.phpt
janiThu Aug 14 23:45:22 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/filebug26615.phpt bug26938.phpt
proc_open01.phpt
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug26615.phpt?r1=1.4.4.1r2=1.4.4.2diff_format=u
Index: php-src/ext/standard/tests/file/bug26615.phpt
diff -u php-src/ext/standard/tests/file/bug26615.phpt:1.4.4.1
php-src/ext/standard/tests/file/bug26615.phpt:1.4.4.2
--- php-src/ext/standard/tests/file/bug26615.phpt:1.4.4.1 Wed Apr 18
14:51:29 2007
+++ php-src/ext/standard/tests/file/bug26615.phpt Thu Aug 14 23:45:22 2008
@@ -7,9 +7,9 @@
$out = array();
$status = -1;
if (substr(PHP_OS, 0, 3) != 'WIN') {
- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r \'for($i=1;$i=5000;$i++) print
$i\n;\' | tr \'\n\' \' \'', $out, $status);
+ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r \'for($i=1;$i=5000;$i++)
print $i\n;\' | tr \'\n\' \' \'', $out, $status);
} else {
- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r for($i=1;$i=5000;$i++) echo
$i,\' \';', $out, $status);
+ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r for($i=1;$i=5000;$i++) echo
$i,\' \';', $out, $status);
}
print_r($out);
?
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug26938.phpt?r1=1.1.8.1r2=1.1.8.2diff_format=u
Index: php-src/ext/standard/tests/file/bug26938.phpt
diff -u php-src/ext/standard/tests/file/bug26938.phpt:1.1.8.1
php-src/ext/standard/tests/file/bug26938.phpt:1.1.8.2
--- php-src/ext/standard/tests/file/bug26938.phpt:1.1.8.1 Wed Apr 18
14:51:29 2007
+++ php-src/ext/standard/tests/file/bug26938.phpt Thu Aug 14 23:45:22 2008
@@ -6,14 +6,14 @@
$status = -1;
$php = getenv('TEST_PHP_EXECUTABLE');
if (substr(PHP_OS, 0, 3) != 'WIN') {
- exec($php . ' -r \''
+ exec($php . ' -n -r \''
. '$lengths = array(10,2,1,5,1,3);'
. 'foreach($lengths as $length) {'
. ' for($i=0;$i$length;$i++) print chr(65+$i % 27);'
. ' print \n;'
. '}\'', $out, $status);
} else {
- exec($php . ' -r '
+ exec($php . ' -n -r '
. '$lengths = array(10,2,1,5,1,3);'
. 'foreach($lengths as $length) {'
. ' for($i=0;$i$length;$i++) print chr(65+$i % 27);'
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/proc_open01.phpt?r1=1.3.4.1.2.1r2=1.3.4.1.2.2diff_format=u
Index: php-src/ext/standard/tests/file/proc_open01.phpt
diff -u php-src/ext/standard/tests/file/proc_open01.phpt:1.3.4.1.2.1
php-src/ext/standard/tests/file/proc_open01.phpt:1.3.4.1.2.2
--- php-src/ext/standard/tests/file/proc_open01.phpt:1.3.4.1.2.1Fri Mar
2 18:54:13 2007
+++ php-src/ext/standard/tests/file/proc_open01.phptThu Aug 14 23:45:22 2008
@@ -9,7 +9,7 @@
die(no php executable defined);
}
$proc = proc_open(
- $php,
+ $php -n,
array(0 = array('pipe', 'r'), 1 = array('pipe', 'w')),
$pipes
);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/examples/tests dualiterator_001.phpt
janiThu Aug 14 23:46:12 2008 UTC Modified files: /php-src/ext/spl/examples/tests dualiterator_001.phpt Log: fix skipif http://cvs.php.net/viewvc.cgi/php-src/ext/spl/examples/tests/dualiterator_001.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/spl/examples/tests/dualiterator_001.phpt diff -u php-src/ext/spl/examples/tests/dualiterator_001.phpt:1.3 php-src/ext/spl/examples/tests/dualiterator_001.phpt:1.4 --- php-src/ext/spl/examples/tests/dualiterator_001.phpt:1.3Sun Dec 10 23:44:35 2006 +++ php-src/ext/spl/examples/tests/dualiterator_001.phptThu Aug 14 23:46:12 2008 @@ -1,7 +1,7 @@ --TEST-- SPL: DualIterator --SKIPIF-- -?php if (!extension_loaded(spl)) print skip; ? +?php if (!extension_loaded(spl) || !extension_loaded(reflection)) print skip; ? --FILE-- ?php -- 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/spl/examples/tests dualiterator_001.phpt /ext/spl/tests dit_002.phpt
janiThu Aug 14 23:46:55 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/spl/examples/tests dualiterator_001.phpt
/php-src/ext/spl/tests dit_002.phpt
Log:
MFH: fix skipifs
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/examples/tests/dualiterator_001.phpt?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/spl/examples/tests/dualiterator_001.phpt
diff -u php-src/ext/spl/examples/tests/dualiterator_001.phpt:1.2.2.3
php-src/ext/spl/examples/tests/dualiterator_001.phpt:1.2.2.4
--- php-src/ext/spl/examples/tests/dualiterator_001.phpt:1.2.2.3Sun Dec
10 23:44:49 2006
+++ php-src/ext/spl/examples/tests/dualiterator_001.phptThu Aug 14
23:46:55 2008
@@ -1,7 +1,7 @@
--TEST--
SPL: DualIterator
--SKIPIF--
-?php if (!extension_loaded(spl)) print skip; ?
+?php if (!extension_loaded(spl) || !extension_loaded(reflection)) print
skip; ?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dit_002.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/spl/tests/dit_002.phpt
diff -u php-src/ext/spl/tests/dit_002.phpt:1.1.4.2
php-src/ext/spl/tests/dit_002.phpt:1.1.4.3
--- php-src/ext/spl/tests/dit_002.phpt:1.1.4.2 Wed Feb 13 12:23:26 2008
+++ php-src/ext/spl/tests/dit_002.phpt Thu Aug 14 23:46:55 2008
@@ -1,7 +1,7 @@
--TEST--
SPL: DirectoryIterator defaults
--SKIPIF--
-?php if (!extension_loaded(spl)) print skip; ?
+?php if (!extension_loaded(spl) || !extension_loaded('reflection')) print
skip; ?
--FILE--
?php
--
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/spl/examples/tests dualiterator_001.phpt
janiThu Aug 14 23:47:43 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl/examples/tests dualiterator_001.phpt Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/spl/examples/tests/dualiterator_001.phpt?r1=1.2.2.3r2=1.2.2.3.2.1diff_format=u Index: php-src/ext/spl/examples/tests/dualiterator_001.phpt diff -u php-src/ext/spl/examples/tests/dualiterator_001.phpt:1.2.2.3 php-src/ext/spl/examples/tests/dualiterator_001.phpt:1.2.2.3.2.1 --- php-src/ext/spl/examples/tests/dualiterator_001.phpt:1.2.2.3Sun Dec 10 23:44:49 2006 +++ php-src/ext/spl/examples/tests/dualiterator_001.phptThu Aug 14 23:47:42 2008 @@ -1,7 +1,7 @@ --TEST-- SPL: DualIterator --SKIPIF-- -?php if (!extension_loaded(spl)) print skip; ? +?php if (!extension_loaded(spl) || !extension_loaded(reflection)) print skip; ? --FILE-- ?php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/pcre php_pcre.c /ext/pcre/tests bug44925.phpt
Like I said in the bug report: THERE IS NO BC issue here.
If any function changes input parameters it's a bug if the function is not supposed to do that!
--Jani
Nuno Lopes [EMAIL PROTECTED] kirjoitti:
I think this change is too intrusive for a bug fix only branch. This
introduces a little BC break (to better match the manual description), so I
think it should only go with 5.3.
Nuno
- Original Message -
Doesn't this bug exist in PHP_5_2 branch? That's not (AFAIK) dead branch
yet so bug fixes MUST go there too.
In which case you move that NEWS entry to the PHP_5_2 NEWS..
--Jani
Nuno Lopes [EMAIL PROTECTED] kirjoitti:
nlopess Thu Aug 14 13:12:42 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pcre/tests bug44925.phpt Modified files:
/php-src NEWS /php-src/ext/pcre php_pcre.c Log:
Fixed bug #44925 (preg_grep() modifies input array)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.268r2=1.2027.2.547.2.965.2.269diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.268
php-src/NEWS:1.2027.2.547.2.965.2.269
--- php-src/NEWS:1.2027.2.547.2.965.2.268 Thu Aug 14 10:13:23 2008
+++ php-src/NEWS Thu Aug 14 13:12:42 2008
@@ -30,6 +30,7 @@
- Fixed bug #45545 (DateInterval has 4 char limitation for ISO
durations).
(Derick)
- Fixed bug #45044 (relative paths not resolved correctly). (Dmitry)
+- Fixed bug #44925 (preg_grep() modifies input array). (Nuno)
- Fixed bug #44100 (Inconsistent handling of static array declarations
with
duplicate keys). (Dmitry)
- Fixed bug #43817 (opendir() fails on Windows directories with parent
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.19r2=1.168.2.9.2.21.2.20diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.19
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.20
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.19 Sat Aug 2 04:46:06
2008
+++ php-src/ext/pcre/php_pcre.c Thu Aug 14 13:12:42 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.19 2008/08/02 04:46:06 felipe Exp
$ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.20 2008/08/14 13:12:42 nlopess Exp
$ */
#include php.h
#include php_ini.h
@@ -1743,13 +1743,30 @@
/* Go through the input array */
zend_hash_internal_pointer_reset(Z_ARRVAL_P(input));
- while(zend_hash_get_current_data(Z_ARRVAL_P(input), (void **)entry) ==
SUCCESS) {
+ while (zend_hash_get_current_data(Z_ARRVAL_P(input), (void **)entry)
== SUCCESS) {
+ zend_bool is_copy;
+ zval *str;
+
+ switch (Z_TYPE_PP(entry)) {
+ case IS_STRING:
+ is_copy = 0;
+ str = *entry;
+ break;
+
+ default:
+ is_copy = 1;
- convert_to_string_ex(entry);
+ ALLOC_ZVAL(str);
+ Z_ADDREF_PP(entry); /* the function below decreases the ref counting */
+ COPY_PZVAL_TO_ZVAL(*str, *entry);
+
+ convert_to_string(str);
+ break;
+ }
/* Perform the match */
- count = pcre_exec(pce-re, extra, Z_STRVAL_PP(entry),
- Z_STRLEN_PP(entry), 0,
+ count = pcre_exec(pce-re, extra, Z_STRVAL_P(str),
+ Z_STRLEN_P(str), 0,
0, offsets, size_offsets);
/* Check for too many substrings condition. */
@@ -1762,25 +1779,30 @@
}
/* If the entry fits our requirements */
- if ((count 0 !invert) ||
- (count == PCRE_ERROR_NOMATCH invert)) {
- Z_ADDREF_PP(entry);
+ if ((count 0 !invert) || (count == PCRE_ERROR_NOMATCH invert))
{
+
+ if (!is_copy) {
+ SEPARATE_ARG_IF_REF(str);
+ }
/* Add to return array */
switch (zend_hash_get_current_key(Z_ARRVAL_P(input), string_key,
num_key, 0))
{
case HASH_KEY_IS_STRING:
zend_hash_update(Z_ARRVAL_P(return_value), string_key,
- strlen(string_key)+1, entry, sizeof(zval *), NULL);
+ strlen(string_key)+1, str, sizeof(zval *), NULL);
break;
case HASH_KEY_IS_LONG:
- zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, entry,
+ zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, str,
sizeof(zval *), NULL);
break;
}
+ } else if (is_copy) {
+ zval_dtor(str);
+ FREE_ZVAL(str);
}
- +
zend_hash_move_forward(Z_ARRVAL_P(input));
}
zend_hash_internal_pointer_reset(Z_ARRVAL_P(input));
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug44925.phpt?view=markuprev=1.1
Index: php-src/ext/pcre/tests/bug44925.phpt
+++ php-src/ext/pcre/tests/bug44925.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / Makefile.global /ext/standard info.c /main php_ini.c /sapi/cgi cgi_main.c /sapi/cli php_cli.c /sapi/milter php_milter.c
Should be fixed now among couple of others that failed for me for various reasons. :) --Jani Dmitry Stogov [EMAIL PROTECTED] kirjoitti: These two are failed. using invalid combinations of cmdline options [sapi/cgi/tests/005.phpt] using invalid combinations of cmdline options [sapi/cli/tests/009.phpt] Thanks. Dmitry. Jani Taskinen wrote: Because it didn't make sense not to allow using both. I thought I fixed those tests..? Or which ones do you mean? --Jani Dmitry Stogov [EMAIL PROTECTED] kirjoitti: Hi Jani, What is the reason of removing -n and -c option check in cli/cgi? It breaks two tests. Thanks. Dmitry. Jani Taskinen wrote: janiWed Aug 13 00:49:59 2008 UTC Modified files: /php-srcMakefile.global /php-src/ext/standardinfo.c /php-src/mainphp_ini.c /php-src/sapi/cgicgi_main.c /php-src/sapi/cli php_cli.c /php-src/sapi/milterphp_milter.cLog: [DOC]- Added methods to change/disable --with-config-file-scan-dir=PATH at [DOC] startup: [DOC] [DOC] To disable: Override default php.ini by using both -c and -n with [DOC] CGI/CLI or set PHP_INI_SCAN_DIR environment variable [DOC] to an empty string.[DOC] [DOC] To change: Simply set PHP_INI_SCAN_DIR environment variable to point[DOC] to another path. - Fixed bug #42604 (make test fails with --with-config-file-scan-dir=/some/path) - Implemented FR #45114 (Option to change --with-config-file-scan-dir) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- 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/posix/tests posix_strerror_error.phpt posix_strerror_variation1.phpt
felipe Fri Aug 15 02:26:56 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/posix/testsposix_strerror_error.phpt
posix_strerror_variation1.phpt
Log:
- Fixed tests (synced with 5_3 and HEAD)
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_strerror_error.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/posix/tests/posix_strerror_error.phpt
diff -u php-src/ext/posix/tests/posix_strerror_error.phpt:1.1.2.2
php-src/ext/posix/tests/posix_strerror_error.phpt:1.1.2.3
--- php-src/ext/posix/tests/posix_strerror_error.phpt:1.1.2.2 Fri Apr 11
11:06:18 2008
+++ php-src/ext/posix/tests/posix_strerror_error.phpt Fri Aug 15 02:26:56 2008
@@ -24,7 +24,7 @@
echo \n-- Testing posix_strerror() function with invalid error number --\n;
$errno = -999;
-var_dump( posix_strerror($errno) );
+echo gettype(posix_strerror($errno)).\n;
echo Done;
?
@@ -42,5 +42,5 @@
bool(false)
-- Testing posix_strerror() function with invalid error number --
-string(%d) Unknown error %d
+string
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/tests/posix_strerror_variation1.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/posix/tests/posix_strerror_variation1.phpt
diff -u php-src/ext/posix/tests/posix_strerror_variation1.phpt:1.1.2.2
php-src/ext/posix/tests/posix_strerror_variation1.phpt:1.1.2.3
--- php-src/ext/posix/tests/posix_strerror_variation1.phpt:1.1.2.2 Fri Apr
11 11:06:18 2008
+++ php-src/ext/posix/tests/posix_strerror_variation1.phpt Fri Aug 15
02:26:56 2008
@@ -73,7 +73,7 @@
foreach($values as $value) {
echo \nArg value $value \n;
- var_dump( posix_strerror($value) );
+ echo gettype(posix_strerror($value)).\n;
};
echo Done;
@@ -86,87 +86,87 @@
Notice: Undefined variable: unset_var in %s on line %d
Arg value 10.5
-string(18) No child processes
+string
Arg value -10.5
-string(%d) Unknown error %d
+string
Arg value 101234567000
-string(%d) Unknown error %d
+string
Arg value 1.07654321E-9
-string(7) Success
+string
Arg value 0.5
-string(7) Success
+string
Arg value Array
Warning: posix_strerror() expects parameter 1 to be long, array given in %s on
line %d
-bool(false)
+boolean
Arg value Array
Warning: posix_strerror() expects parameter 1 to be long, array given in %s on
line %d
-bool(false)
+boolean
Arg value Array
Warning: posix_strerror() expects parameter 1 to be long, array given in %s on
line %d
-bool(false)
+boolean
Arg value Array
Warning: posix_strerror() expects parameter 1 to be long, array given in %s on
line %d
-bool(false)
+boolean
Arg value Array
Warning: posix_strerror() expects parameter 1 to be long, array given in %s on
line %d
-bool(false)
+boolean
Arg value
-string(7) Success
+string
Arg value
-string(7) Success
+string
Arg value 1
-string(23) Operation not permitted
+string
Arg value
-string(7) Success
+string
Arg value 1
-string(23) Operation not permitted
+string
Arg value
-string(7) Success
+string
Arg value
Warning: posix_strerror() expects parameter 1 to be long, string given in %s
on line %d
-bool(false)
+boolean
Arg value
Warning: posix_strerror() expects parameter 1 to be long, string given in %s
on line %d
-bool(false)
+boolean
Arg value string
Warning: posix_strerror() expects parameter 1 to be long, string given in %s
on line %d
-bool(false)
+boolean
Arg value string
Warning: posix_strerror() expects parameter 1 to be long, string given in %s
on line %d
-bool(false)
+boolean
Arg value
-string(7) Success
+string
Arg value
-string(7) Success
+string
Catchable fatal error: Object of class stdClass could not be converted to
string in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
