[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Mar 2 01:32:36 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3331r2=1.3332diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3331 php-src/ChangeLog:1.3332 --- php-src/ChangeLog:1.3331Sat Feb 28 01:32:43 2009 +++ php-src/ChangeLog Mon Mar 2 01:32:35 2009 @@ -1,3 +1,84 @@ +2009-03-01 Antony Dovgal t...@daylessday.org + +* ext/date/tests/gmstrftime_variation18.phpt + ext/date/tests/gmstrftime_variation18.phpt + ext/date/tests/strftime_variation18.phpt + ext/date/tests/strftime_variation18.phpt: + fix tests + +2009-03-01 Ilia Alshanetsky i...@prohost.org + +* (PHP_5_2) + NEWS + ext/filter/logical_filters.c: + + MFB: Fixed bug #47435 (FILTER_FLAG_NO_PRIV_RANGE does not work with ipv6 + addresses in the filter extension) + +* (PHP_5_2) + NEWS + ext/zip/php_zip.c: + MFB: Fixed 2 memory corruptions in zip extension idenfied by + oo_properties.phpt test + +2009-03-01 Greg Beaver g...@chiaraquartet.net + +* ext/phar/config.w32: + re-disable phar in HEAD on windows + +* ext/phar/tests/phar_get_supported_signatures_002.phpt: + MFB: revert removal of openssl check, was confusion on my part + +* (PHP_5_3) + ext/phar/tests/phar_get_supported_signatures_002.phpt: + revert removal of openssl check, was confusion on my part + +* ext/phar/tests/phar_gzip.phpt + ext/phar/tests/zip/phar_stub.phpt: + MFB: add safeguard check for timestamp modification to phar_stub.phpt and + phar_gzip.phpt + +* (PHP_5_3) + ext/phar/tests/phar_gzip.phpt + ext/phar/tests/zip/phar_stub.phpt: + add safeguard check for timestamp modification to phar_stub.phpt and + phar_gzip.phpt + +* ext/phar/config.w32: + MFB: fix hash support on windows in ext/phar (Kalle) + +* (PHP_5_3) + ext/phar/config.w32: + fix hash support on windows in ext/phar (Kalle) + +* ext/phar/tests/files/blog.phar + ext/phar/tests/files/blog.phar.inc: + MFB: fix blog.phar for front.phar.phpt test + +* (PHP_5_3) + ext/phar/tests/files/blog.phar + ext/phar/tests/files/blog.phar.inc: + fix blog.phar for front.phar.phpt test + +* ext/phar/zip.c: + MFB: fix swapping of time/date in timestamp saving for zip, which can cause + crash on windows + +* (PHP_5_3) + NEWS + ext/phar/zip.c: + update NEWS with phar enabling, fix swapping of time/date in timestamp + saving for zip, which can cause crash on windows + +* ext/phar/tests/front.phar.phpt + ext/phar/tests/phar_get_supported_signatures_002.phpt: + MFB: fix SKIPIF, EXPECT in 2 tests + +* (PHP_5_3) + ext/phar/tests/front.phar.phpt + ext/phar/tests/phar_get_supported_signatures_002.phpt: + fix SKIPIF, EXPECT in 2 tests + 2009-02-27 George Wang gw...@litespeedtech.com * (PHP_5_3) @@ -30854,7 +30935,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3331 2009/02/28 01:32:43 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3332 2009/03/02 01:32:35 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/zip php_zip.c
iliaa Sun Mar 1 17:35:26 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/zipphp_zip.c
Log:
MFB: Fixed 2 memory corruptions in zip extension idenfied by
oo_properties.phpt test
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1430r2=1.2027.2.547.2.1431diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1430 php-src/NEWS:1.2027.2.547.2.1431
--- php-src/NEWS:1.2027.2.547.2.1430Wed Feb 25 15:34:33 2009
+++ php-src/NEWSSun Mar 1 17:35:25 2009
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2009, PHP 5.2.10
+- Fixed memory corruptions while reading properties of zip files. (Ilia)
26 Feb 2009, PHP 5.2.9
- Changed __call() to be invoked on private/protected method access, similar to
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.49r2=1.1.2.50diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.49 php-src/ext/zip/php_zip.c:1.1.2.50
--- php-src/ext/zip/php_zip.c:1.1.2.49 Thu Feb 5 19:53:22 2009
+++ php-src/ext/zip/php_zip.c Sun Mar 1 17:35:25 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.c,v 1.1.2.49 2009/02/05 19:53:22 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.1.2.50 2009/03/01 17:35:25 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -806,6 +806,7 @@
} else {
if (hnd-read_const_char_from_obj_func) {
retchar =
hnd-read_const_char_from_obj_func(obj TSRMLS_CC);
+ len = strlen(retchar);
}
}
}
@@ -818,7 +819,7 @@
switch (hnd-type) {
case IS_STRING:
if (retchar) {
- ZVAL_STRING(*retval, (char *) retchar, 1);
+ ZVAL_STRINGL(*retval, (char *) retchar, len, 1);
} else {
ZVAL_EMPTY_STRING(*retval);
}
@@ -941,10 +942,11 @@
if (ret == SUCCESS) {
zval *tmp;
+ ALLOC_INIT_ZVAL(tmp);
if (type == 2) {
retval = 1;
- } else if (php_zip_property_reader(obj, hnd, tmp, 1 TSRMLS_CC)
== SUCCESS) {
+ } else if (php_zip_property_reader(obj, hnd, tmp, 0 TSRMLS_CC)
== SUCCESS) {
Z_SET_REFCOUNT_P(tmp, 1);
Z_UNSET_ISREF_P(tmp);
if (type == 1) {
@@ -952,8 +954,9 @@
} else if (type == 0) {
retval = (Z_TYPE_P(tmp) != IS_NULL);
}
- zval_ptr_dtor(tmp);
}
+
+ zval_ptr_dtor(tmp);
} else {
std_hnd = zend_get_std_object_handlers();
retval = std_hnd-has_property(object, member, type TSRMLS_CC);
@@ -2557,7 +2560,7 @@
php_info_print_table_start();
php_info_print_table_row(2, Zip, enabled);
- php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v
1.1.2.49 2009/02/05 19:53:22 pajoye Exp $);
+ php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v
1.1.2.50 2009/03/01 17:35:25 iliaa Exp $);
php_info_print_table_row(2, Zip version, PHP_ZIP_VERSION_STRING);
php_info_print_table_row(2, Libzip version, 0.9.0);
--
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 logical_filters.c
iliaa Sun Mar 1 17:36:09 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/filter logical_filters.c
Log:
MFB: Fixed bug #47435 (FILTER_FLAG_NO_PRIV_RANGE does not work with ipv6
addresses in the filter extension)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1431r2=1.2027.2.547.2.1432diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1431 php-src/NEWS:1.2027.2.547.2.1432
--- php-src/NEWS:1.2027.2.547.2.1431Sun Mar 1 17:35:25 2009
+++ php-src/NEWSSun Mar 1 17:36:09 2009
@@ -3,6 +3,9 @@
?? ??? 2009, PHP 5.2.10
- Fixed memory corruptions while reading properties of zip files. (Ilia)
+- Fixed bug #47435 (FILTER_FLAG_NO_PRIV_RANGE does not work with ipv6
+ addresses in the filter extension). (Ilia)
+
26 Feb 2009, PHP 5.2.9
- Changed __call() to be invoked on private/protected method access, similar to
properties and __get(). (Andrei)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.28r2=1.1.2.29diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.28
php-src/ext/filter/logical_filters.c:1.1.2.29
--- php-src/ext/filter/logical_filters.c:1.1.2.28 Mon Feb 2 23:51:58 2009
+++ php-src/ext/filter/logical_filters.cSun Mar 1 17:36:09 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: logical_filters.c,v 1.1.2.28 2009/02/02 23:51:58 iliaa Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.29 2009/03/01 17:36:09 iliaa Exp $ */
#include php_filter.h
#include filter_private.h
@@ -655,6 +655,12 @@
if (res 1) {
RETURN_VALIDATION_FAILED
}
+ /* Check flags */
+ if (flags FILTER_FLAG_NO_PRIV_RANGE) {
+ if (Z_STRLEN_P(value) =2
(!strncasecmp(FC, Z_STRVAL_P(value), 2) || !strncasecmp(FD,
Z_STRVAL_P(value), 2))) {
+ RETURN_VALIDATION_FAILED
+ }
+ }
}
break;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests gmstrftime_variation18.phpt strftime_variation18.phpt
tony2001Sun Mar 1 21:26:47 2009 UTC Modified files: /php-src/ext/date/tests gmstrftime_variation18.phpt strftime_variation18.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/gmstrftime_variation18.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/date/tests/gmstrftime_variation18.phpt diff -u php-src/ext/date/tests/gmstrftime_variation18.phpt:1.2 php-src/ext/date/tests/gmstrftime_variation18.phpt:1.3 --- php-src/ext/date/tests/gmstrftime_variation18.phpt:1.2 Thu Jan 22 18:47:25 2009 +++ php-src/ext/date/tests/gmstrftime_variation18.phpt Sun Mar 1 21:26:47 2009 @@ -32,6 +32,6 @@ *** Testing gmstrftime() : usage variation *** -- Testing gmstrftime() function with Day of the month as decimal single digit format -- -unicode(%d) %d +unicode(%d) %s unicode(2) 8 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strftime_variation18.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/date/tests/strftime_variation18.phpt diff -u php-src/ext/date/tests/strftime_variation18.phpt:1.1 php-src/ext/date/tests/strftime_variation18.phpt:1.2 --- php-src/ext/date/tests/strftime_variation18.phpt:1.1Wed Jan 21 10:49:40 2009 +++ php-src/ext/date/tests/strftime_variation18.phptSun Mar 1 21:26:47 2009 @@ -31,6 +31,6 @@ *** Testing strftime() : usage variation *** -- Testing strftime() function with Day of the month as decimal single digit format -- -unicode(%d) %d +unicode(%d) %s unicode(2) 8 ===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/date/tests gmstrftime_variation18.phpt strftime_variation18.phpt
tony2001Sun Mar 1 21:26:54 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date/tests gmstrftime_variation18.phpt strftime_variation18.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/gmstrftime_variation18.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/date/tests/gmstrftime_variation18.phpt diff -u php-src/ext/date/tests/gmstrftime_variation18.phpt:1.1.4.2 php-src/ext/date/tests/gmstrftime_variation18.phpt:1.1.4.3 --- php-src/ext/date/tests/gmstrftime_variation18.phpt:1.1.4.2 Thu Jan 22 18:47:20 2009 +++ php-src/ext/date/tests/gmstrftime_variation18.phpt Sun Mar 1 21:26:54 2009 @@ -32,6 +32,6 @@ *** Testing gmstrftime() : usage variation *** -- Testing gmstrftime() function with Day of the month as decimal single digit format -- -string(%d) %d +string(%d) %s string(2) 8 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strftime_variation18.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/date/tests/strftime_variation18.phpt diff -u php-src/ext/date/tests/strftime_variation18.phpt:1.1.2.2 php-src/ext/date/tests/strftime_variation18.phpt:1.1.2.3 --- php-src/ext/date/tests/strftime_variation18.phpt:1.1.2.2Wed Jan 21 10:51:03 2009 +++ php-src/ext/date/tests/strftime_variation18.phptSun Mar 1 21:26:54 2009 @@ -31,6 +31,6 @@ *** Testing strftime() : usage variation *** -- Testing strftime() function with Day of the month as decimal single digit format -- -string(%d) %d +string(%d) %s string(2) 8 ===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tokenizer Makefile.frag
shire Mon Mar 2 03:54:01 2009 UTC Modified files: /php-src/ext/tokenizer Makefile.frag Log: fix tokenizer makefile dependencies on parser/scanner files when built dynamically. (See bug #38762) http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/Makefile.frag?r1=1.6r2=1.7diff_format=u Index: php-src/ext/tokenizer/Makefile.frag diff -u php-src/ext/tokenizer/Makefile.frag:1.6 php-src/ext/tokenizer/Makefile.frag:1.7 --- php-src/ext/tokenizer/Makefile.frag:1.6 Thu Mar 27 08:32:48 2008 +++ php-src/ext/tokenizer/Makefile.frag Mon Mar 2 03:54:01 2009 @@ -1,3 +1,4 @@ - +$(top_srcdir)/Zend/zend_language_parser.c: +$(top_srcdir)/Zend/zend_language_scanner.c: $(builddir)/tokenizer.lo: $(top_srcdir)/Zend/zend_language_parser.c $(top_srcdir)/Zend/zend_language_scanner.c -- 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/tokenizer Makefile.frag
shire Mon Mar 2 03:54:04 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/tokenizer Makefile.frag Log: MFH: fix tokenizer makefile dependencies on parser/scanner files when built dynamically. (See bug #38762) http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/Makefile.frag?r1=1.3.6.1.2.1r2=1.3.6.1.2.2diff_format=u Index: php-src/ext/tokenizer/Makefile.frag diff -u php-src/ext/tokenizer/Makefile.frag:1.3.6.1.2.1 php-src/ext/tokenizer/Makefile.frag:1.3.6.1.2.2 --- php-src/ext/tokenizer/Makefile.frag:1.3.6.1.2.1 Sun Mar 16 21:06:53 2008 +++ php-src/ext/tokenizer/Makefile.frag Mon Mar 2 03:54:04 2009 @@ -1,2 +1,3 @@ - +$(top_srcdir)/Zend/zend_language_parser.c: +$(top_srcdir)/Zend/zend_language_scanner.c: $(builddir)/tokenizer.lo: $(top_srcdir)/Zend/zend_language_parser.c $(top_srcdir)/Zend/zend_language_scanner.c -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
philip Mon Mar 2 04:00:02 2009 UTC Modified files: /CVSROOTavail Log: - Give Kohei KaiGai (kaigai) karma for pecl/selinux and phpdoc http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1497r2=1.1498diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1497 CVSROOT/avail:1.1498 --- CVSROOT/avail:1.1497Wed Feb 25 07:23:05 2009 +++ CVSROOT/avail Mon Mar 2 04:00:01 2009 @@ -305,6 +305,7 @@ avail|rjcarroll|pecl/fuse avail|ab|pecl/gender avail|kristina|pecl/mongo +avail|kaigai|pecl/selinux,phpdoc # Objective-C bridge avail|wez,jan|php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-recommended
moriyoshi Mon Mar 2 04:43:51 2009 UTC Modified files: /php-srcphp.ini-recommended Log: - Fix typo. http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.240r2=1.241diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.240 php-src/php.ini-recommended:1.241 --- php-src/php.ini-recommended:1.240 Fri Feb 13 16:54:16 2009 +++ php-src/php.ini-recommended Mon Mar 2 04:43:51 2009 @@ -1169,7 +1169,7 @@ ;mbstring.func_overload = 0 ; enable strict encoding detection. -;mbstring.strict_encoding = Off +;mbstring.strict_detection = Off [gd] ; Tell the jpeg decode to libjpeg warnings and try to create -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-recommended
moriyoshi Mon Mar 2 04:44:15 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-recommended Log: MFH: Fix typo http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.23.2.21r2=1.179.2.11.2.23.2.22diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.23.2.21 php-src/php.ini-recommended:1.179.2.11.2.23.2.22 --- php-src/php.ini-recommended:1.179.2.11.2.23.2.21Fri Feb 13 16:54:56 2009 +++ php-src/php.ini-recommended Mon Mar 2 04:44:15 2009 @@ -1271,7 +1271,7 @@ ;mbstring.func_overload = 0 ; enable strict encoding detection. -;mbstring.strict_encoding = Off +;mbstring.strict_detection = Off [gd] ; Tell the jpeg decode to libjpeg warnings and try to create -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-recommended
moriyoshi Mon Mar 2 04:44:35 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-recommended Log: - MFH: Fix typo. http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.30r2=1.179.2.11.2.31diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.30 php-src/php.ini-recommended:1.179.2.11.2.31 --- php-src/php.ini-recommended:1.179.2.11.2.30 Fri Feb 13 16:55:18 2009 +++ php-src/php.ini-recommended Mon Mar 2 04:44:35 2009 @@ -1278,7 +1278,7 @@ ;mbstring.func_overload = 0 ; enable strict encoding detection. -;mbstring.strict_encoding = Off +;mbstring.strict_detection = Off [FrontBase] ;fbsql.allow_persistent = On -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
