Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/pcre/pcrelib AUTHORS ChangeLog LICENCE NEWS NON-UNIX-USE README config.h dftables.c pcre.h pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c pcr
Thanks. Ilia Alshanetsky On 14-Apr-09, at 4:57 PM, Nuno Lopes wrote: Ok, done. Nuno We should upgrade the lib for 5.2 as well. Ilia Alshanetsky On 11-Apr-09, at 2:57 PM, Nuno Lopes wrote: nlopess Sat Apr 11 18:57:29 2009 UTC7 Log: upgrade PCRE to version 7.9 -- 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/pcrelib AUTHORS ChangeLog LICENCE NEWS NON-UNIX-USE README config.h dftables.c pcre.h pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c pcr
Ok, done. Nuno We should upgrade the lib for 5.2 as well. Ilia Alshanetsky On 11-Apr-09, at 2:57 PM, Nuno Lopes wrote: nlopess Sat Apr 11 18:57:29 2009 UTC7 Log: upgrade PCRE to version 7.9 -- 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/pcre php_pcre.c /ext/pcre/tests bug47662.phpt
nlopess Tue Apr 14 20:31:32 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/pcre/tests bug47662.phpt Modified files: /php-src/ext/pcre php_pcre.c Log: MFH: fix bug #47662: support more than 127 named subpatterns http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.30&r2=1.168.2.9.2.31&diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.30 php-src/ext/pcre/php_pcre.c:1.168.2.9.2.31 --- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.30 Tue Jan 13 19:23:31 2009 +++ php-src/ext/pcre/php_pcre.c Tue Apr 14 20:31:31 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_pcre.c,v 1.168.2.9.2.30 2009/01/13 19:23:31 andrei Exp $ */ +/* $Id: php_pcre.c,v 1.168.2.9.2.31 2009/04/14 20:31:31 nlopess Exp $ */ #include "php.h" #include "php_ini.h" @@ -209,7 +209,7 @@ } while (ni++ < name_cnt) { - name_idx = 0xff * name_table[0] + name_table[1]; + name_idx = 0xff * (unsigned char)name_table[0] + (unsigned char)name_table[1]; subpat_names[name_idx] = name_table + 2; if (is_numeric_string(subpat_names[name_idx], strlen(subpat_names[name_idx]), NULL, NULL, 0) > 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Numeric named subpatterns are not allowed"); http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug47662.phpt?view=markup&rev=1.1 Index: php-src/ext/pcre/tests/bug47662.phpt +++ php-src/ext/pcre/tests/bug47662.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/pcrelib AUTHORS ChangeLog LICENCE NEWS NON-UNIX-USE README config.h dftables.c pcre.h pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c pcr
We should upgrade the lib for 5.2 as well. Ilia Alshanetsky On 11-Apr-09, at 2:57 PM, Nuno Lopes wrote: nlopess Sat Apr 11 18:57:29 2009 UTC7 Log: upgrade PCRE to version 7.9 -- 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
iliaa Tue Apr 14 15:48:38 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Sqlite news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.557&r2=1.2027.2.547.2.965.2.558&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.557 php-src/NEWS:1.2027.2.547.2.965.2.558 --- php-src/NEWS:1.2027.2.547.2.965.2.557 Sat Apr 11 18:57:26 2009 +++ php-src/NEWSTue Apr 14 15:48:37 2009 @@ -2,7 +2,7 @@ ||| ?? ??? 200?, PHP 5.3.0 RC 2 - Undeprecated ticks. (Arnaud) -- Upgraded bundled sqlite to version 3.6.12. (Scott) +- Upgraded bundled sqlite to version 3.6.13. (Ilia) - Upgraded bundled PCRE to version 7.9. (Nuno) - Added 'n' flag to fopen to allow passing O_NONBLOCK to the underlying open(2) system call. (Mikko) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/filter filter.c
tony2001Tue Apr 14 14:18:50 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/filter filter.c Log: MFH: revert wrong fix for bug #47930 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1468&r2=1.2027.2.547.2.1469&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1468 php-src/NEWS:1.2027.2.547.2.1469 --- php-src/NEWS:1.2027.2.547.2.1468Mon Apr 13 19:38:52 2009 +++ php-src/NEWSTue Apr 14 14:18:49 2009 @@ -11,8 +11,6 @@ - Fixed segfault on invalid session.save_path. (Hannes) - Fixed bug #47946 (ImageConvolution overwrites background). (Ilia) -- Fixed bug #47930 (ext/filter crashes if extension bails out in activate). - (Stas) - Fixed bug #47903 ("@" operator does not work with string offsets). (Felipe) - Fixed bug #47893 (CLI aborts on non blocking stdout). (Arnaud) - Fixed bug #47849 (Non-deep import loses the namespace). (Rob) http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.46&r2=1.52.2.47&diff_format=u Index: php-src/ext/filter/filter.c diff -u php-src/ext/filter/filter.c:1.52.2.46 php-src/ext/filter/filter.c:1.52.2.47 --- php-src/ext/filter/filter.c:1.52.2.46 Mon Apr 13 19:37:35 2009 +++ php-src/ext/filter/filter.c Tue Apr 14 14:18:49 2009 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: filter.c,v 1.52.2.46 2009/04/13 19:37:35 stas Exp $ */ +/* $Id: filter.c,v 1.52.2.47 2009/04/14 14:18:49 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -101,7 +101,7 @@ filter_functions, PHP_MINIT(filter), PHP_MSHUTDOWN(filter), - PHP_RINIT(filter), + NULL, PHP_RSHUTDOWN(filter), PHP_MINFO(filter), "0.11.0", @@ -249,20 +249,6 @@ } /* }}} */ -/* {{{ PHP_RINIT_FUNCTION - */ -PHP_RINIT_FUNCTION(filter) -{ - IF_G(get_array) = NULL; - IF_G(post_array) = NULL; - IF_G(cookie_array) = NULL; - IF_G(server_array) = NULL; - IF_G(env_array) = NULL; - IF_G(session_array) = NULL; - return SUCCESS; -} -/* }}} */ - /* {{{ PHP_RSHUTDOWN_FUNCTION */ #define VAR_ARRAY_COPY_DTOR(a) \ @@ -289,7 +275,7 @@ { php_info_print_table_start(); php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); - php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.46 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.47 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); -- 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/filter filter.c
tony2001Tue Apr 14 14:18:35 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/filter filter.c Log: MFH: revert wrong fix for bug #47930 http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.39.2.14&r2=1.52.2.39.2.15&diff_format=u Index: php-src/ext/filter/filter.c diff -u php-src/ext/filter/filter.c:1.52.2.39.2.14 php-src/ext/filter/filter.c:1.52.2.39.2.15 --- php-src/ext/filter/filter.c:1.52.2.39.2.14 Mon Apr 13 19:21:28 2009 +++ php-src/ext/filter/filter.c Tue Apr 14 14:18:35 2009 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: filter.c,v 1.52.2.39.2.14 2009/04/13 19:21:28 stas Exp $ */ +/* $Id: filter.c,v 1.52.2.39.2.15 2009/04/14 14:18:35 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -138,7 +138,7 @@ filter_functions, PHP_MINIT(filter), PHP_MSHUTDOWN(filter), - PHP_RINIT(filter), + NULL, PHP_RSHUTDOWN(filter), PHP_MINFO(filter), "0.11.0", @@ -286,20 +286,6 @@ } /* }}} */ -/* {{{ PHP_RINIT_FUNCTION - */ -PHP_RINIT_FUNCTION(filter) -{ - IF_G(get_array) = NULL; - IF_G(post_array) = NULL; - IF_G(cookie_array) = NULL; - IF_G(server_array) = NULL; - IF_G(env_array) = NULL; - IF_G(session_array) = NULL; - return SUCCESS; -} -/* }}} */ - /* {{{ PHP_RSHUTDOWN_FUNCTION */ #define VAR_ARRAY_COPY_DTOR(a) \ @@ -326,7 +312,7 @@ { php_info_print_table_start(); php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); - php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.39.2.14 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.39.2.15 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/filter filter.c
tony2001Tue Apr 14 14:18:14 2009 UTC Modified files: /php-src/ext/filter filter.c Log: revert wrong fix for bug #47930 http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.102&r2=1.103&diff_format=u Index: php-src/ext/filter/filter.c diff -u php-src/ext/filter/filter.c:1.102 php-src/ext/filter/filter.c:1.103 --- php-src/ext/filter/filter.c:1.102 Mon Apr 13 19:24:52 2009 +++ php-src/ext/filter/filter.c Tue Apr 14 14:18:14 2009 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: filter.c,v 1.102 2009/04/13 19:24:52 stas Exp $ */ +/* $Id: filter.c,v 1.103 2009/04/14 14:18:14 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -138,7 +138,7 @@ filter_functions, PHP_MINIT(filter), PHP_MSHUTDOWN(filter), - PHP_RINIT(filter), + NULL, PHP_RSHUTDOWN(filter), PHP_MINFO(filter), "0.11.0", @@ -286,20 +286,6 @@ } /* }}} */ -/* {{{ PHP_RINIT_FUNCTION - */ -PHP_RINIT_FUNCTION(filter) -{ - IF_G(get_array) = NULL; - IF_G(post_array) = NULL; - IF_G(cookie_array) = NULL; - IF_G(server_array) = NULL; - IF_G(env_array) = NULL; - IF_G(session_array) = NULL; - return SUCCESS; -} -/* }}} */ - /* {{{ PHP_RSHUTDOWN_FUNCTION */ #define VAR_ARRAY_COPY_DTOR(a) \ @@ -326,7 +312,7 @@ { php_info_print_table_start(); php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); - php_info_print_table_row( 2, "Revision", "$Revision: 1.102 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.103 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/filter filter.c
On 13.04.2009 23:24, Stanislav Malyshev wrote: > stas Mon Apr 13 19:24:52 2009 UTC > > Modified files: > /php-src/ext/filter filter.c > Log: > fix #47930 All tests fail after this patch, because of this: # /local/qa/5_3/tests/classes/autoload_005.diff 011+ [Tue Apr 14 00:28:40 2009] Script: '/local/qa/5_3/tests/classes/autoload_005.php' 012+ /local/qa/5_3/ext/filter/filter.c(417) : Freeing 0x01384538 (64 bytes), script=/local/qa/5_3/tests/classes/autoload_005.php 013+ /local/qa/5_3/Zend/zend_alloc.c(2410) : Actual location (location was relayed) 014+ Last leak repeated 2 times 015+ [Tue Apr 14 00:28:40 2009] Script: '/local/qa/5_3/tests/classes/autoload_005.php' 016+ /local/qa/5_3/ext/filter/filter.c(444) : Freeing 0x01384F58 (45 bytes), script=/local/qa/5_3/tests/classes/autoload_005.php 017+ Last leak repeated 4 times 018+ [Tue Apr 14 00:28:40 2009] Script: '/local/qa/5_3/tests/classes/autoload_005.php' 019+ /local/qa/5_3/main/php_variables.c(217) : Freeing 0x01384FE0 (32 bytes), script=/local/qa/5_3/tests/classes/autoload_005.php 020+ Last leak repeated 4 times 021+ [Tue Apr 14 00:28:40 2009] Script: '/local/qa/5_3/tests/classes/autoload_005.php' 022+ /local/qa/5_3/Zend/zend_hash.c(247) : Freeing 0x01386A50 (80 bytes), script=/local/qa/5_3/tests/classes/autoload_005.php 023+ Last leak repeated 4 times 024+ === Total 18 memory leaks detected === -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/filter filter.c
Hi Stas, This fix is incorrect. Now all 5.3 tests are failed for me because of memory leaks. The problem that php_sapi_filter() might be called from php_hash_environment() before RINIT() and your patch just overwrites properly initialized data. For some reason php_sapi_filter() isn't called in 5.2 and HEAD and they seem to work, however according to code they may have the same issue. Thanks. Dmitry. Stanislav Malyshev wrote: stasMon Apr 13 19:24:52 2009 UTC Modified files: /php-src/ext/filter filter.c Log: fix #47930 http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.101&r2=1.102&diff_format=u Index: php-src/ext/filter/filter.c diff -u php-src/ext/filter/filter.c:1.101 php-src/ext/filter/filter.c:1.102 --- php-src/ext/filter/filter.c:1.101 Tue Mar 10 23:39:17 2009 +++ php-src/ext/filter/filter.c Mon Apr 13 19:24:52 2009 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: filter.c,v 1.101 2009/03/10 23:39:17 helly Exp $ */ +/* $Id: filter.c,v 1.102 2009/04/13 19:24:52 stas Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -138,7 +138,7 @@ filter_functions, PHP_MINIT(filter), PHP_MSHUTDOWN(filter), - NULL, + PHP_RINIT(filter), PHP_RSHUTDOWN(filter), PHP_MINFO(filter), "0.11.0", @@ -286,6 +286,20 @@ } /* }}} */ +/* {{{ PHP_RINIT_FUNCTION + */ +PHP_RINIT_FUNCTION(filter) +{ + IF_G(get_array) = NULL; + IF_G(post_array) = NULL; + IF_G(cookie_array) = NULL; + IF_G(server_array) = NULL; + IF_G(env_array) = NULL; + IF_G(session_array) = NULL; + return SUCCESS; +} +/* }}} */ + /* {{{ PHP_RSHUTDOWN_FUNCTION */ #define VAR_ARRAY_COPY_DTOR(a) \ @@ -312,7 +326,7 @@ { php_info_print_table_start(); php_info_print_table_row( 2, "Input Validation and Filtering", "enabled" ); - php_info_print_table_row( 2, "Revision", "$Revision: 1.101 $"); + php_info_print_table_row( 2, "Revision", "$Revision: 1.102 $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php