[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed Apr 15 01:32:36 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3374r2=1.3375diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3374 php-src/ChangeLog:1.3375 --- php-src/ChangeLog:1.3374Tue Apr 14 01:32:48 2009 +++ php-src/ChangeLog Wed Apr 15 01:32:35 2009 @@ -1,3 +1,70 @@ +2009-04-14 Nuno Lopes nunoplo...@sapo.pt + +* (PHP_5_2) + ext/pcre/php_pcre.c + ext/pcre/tests/bug47662.phpt: + MFH: fix bug #47662: support more than 127 named subpatterns + +* (PHP_5_2) + ext/pcre/pcrelib/AUTHORS + ext/pcre/pcrelib/ChangeLog + ext/pcre/pcrelib/LICENCE + ext/pcre/pcrelib/NEWS + ext/pcre/pcrelib/NON-UNIX-USE + ext/pcre/pcrelib/README + ext/pcre/pcrelib/config.h + ext/pcre/pcrelib/dftables.c + ext/pcre/pcrelib/pcre.h + ext/pcre/pcrelib/pcre_compile.c + ext/pcre/pcrelib/pcre_config.c + ext/pcre/pcrelib/pcre_exec.c + ext/pcre/pcrelib/pcre_fullinfo.c + ext/pcre/pcrelib/pcre_get.c + ext/pcre/pcrelib/pcre_globals.c + ext/pcre/pcrelib/pcre_info.c + ext/pcre/pcrelib/pcre_internal.h + ext/pcre/pcrelib/pcre_maketables.c + ext/pcre/pcrelib/pcre_newline.c + ext/pcre/pcrelib/pcre_ord2utf8.c + ext/pcre/pcrelib/pcre_printint.src + ext/pcre/pcrelib/pcre_refcount.c + ext/pcre/pcrelib/pcre_study.c + ext/pcre/pcrelib/pcre_tables.c + ext/pcre/pcrelib/pcre_try_flipped.c + ext/pcre/pcrelib/pcre_valid_utf8.c + ext/pcre/pcrelib/pcre_version.c + ext/pcre/pcrelib/pcre_xclass.c + ext/pcre/pcrelib/pcregrep.c + ext/pcre/pcrelib/pcreposix.c + ext/pcre/pcrelib/pcreposix.h + ext/pcre/pcrelib/ucp.h + ext/pcre/pcrelib/doc/pcre.txt + ext/pcre/pcrelib/testdata/grepinputx + ext/pcre/pcrelib/testdata/grepoutput + ext/pcre/pcrelib/testdata/testinput1 + ext/pcre/pcrelib/testdata/testinput2 + ext/pcre/pcrelib/testdata/testinput5 + ext/pcre/pcrelib/testdata/testinput6 + ext/pcre/pcrelib/testdata/testinput7 + ext/pcre/pcrelib/testdata/testoutput1 + ext/pcre/pcrelib/testdata/testoutput2 + ext/pcre/pcrelib/testdata/testoutput5 + ext/pcre/pcrelib/testdata/testoutput6 + ext/pcre/pcrelib/testdata/testoutput7: + upgrade to pcre 7.9 + +2009-04-14 Ilia Alshanetsky i...@prohost.org + +* (PHP_5_3) + NEWS: + + Sqlite news + +2009-04-14 Antony Dovgal t...@daylessday.org + +* ext/filter/filter.c: + revert wrong fix for bug #47930 + 2009-04-13 Stanislav Malyshev s...@zend.com * (PHP_5_2) @@ -36430,7 +36497,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3374 2009/04/14 01:32:48 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3375 2009/04/15 01:32:35 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
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.101r2=1.102diff_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
[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.14r2=1.52.2.39.2.15diff_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(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.557r2=1.2027.2.547.2.965.2.558diff_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
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_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.30r2=1.168.2.9.2.31diff_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=markuprev=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
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
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
