[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Apr 30 01:32:43 2009 UTC
Modified files:
/php-srcChangeLog
Log:
ChangeLog update
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3388r2=1.3389diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3388 php-src/ChangeLog:1.3389
--- php-src/ChangeLog:1.3388Wed Apr 29 01:32:44 2009
+++ php-src/ChangeLog Thu Apr 30 01:32:42 2009
@@ -1,3 +1,52 @@
+2009-04-29 Ilia Alshanetsky i...@prohost.org
+
+* (PHP_5_2)
+ ext/standard/basic_functions.c
+ ext/standard/tests/network/ip2long_error.phpt
+ ext/standard/tests/network/ip2long_variation1.phpt
+ ext/standard/tests/network/ip_x86_64.phpt
+ ext/standard/tests/network/long2ip_error.phpt
+ ext/standard/tests/network/long2ip_variation1.phpt:
+
+ Update tests to accomodate new parameter parsing API and make long2ip()
+ use
+ it as well
+
+* (PHP_5_2)
+ NEWS:
+
+ timezone db upgrade news
+
+2009-04-29 Derick Rethans p...@derickrethans.nl
+
+* ext/date/lib/timezonedb.h
+ ext/date/lib/timezonedb.h
+ ext/date/lib/timezonedb.h:
+ - Updated to version 2009.7 (2009g)
+
+2009-04-29 Zoe Slattery zoe.slatt...@googlemail.com
+
+* ext/standard/tests/strings/strcoll.phpt
+ ext/standard/tests/strings/strcoll.phpt
+ ext/standard/tests/strings/strcoll.phpt:
+ Refixing to follow documented behaviour
+
+2009-04-29 Greg Beaver g...@chiaraquartet.net
+
+* ext/phar/phar.c
+ ext/phar/phar.c
+ ext/phar/phar_internal.h
+ ext/phar/phar_internal.h
+ ext/phar/phar_object.c
+ ext/phar/phar_object.c
+ ext/phar/tar.c
+ ext/phar/tar.c
+ ext/phar/util.c
+ ext/phar/util.c
+ ext/phar/zip.c
+ ext/phar/zip.c:
+ MFPECL: fix PECL bug #16338, php_stream_copy_to_stream{,_ex}()
+
2009-04-28 Felipe Pena felipe...@gmail.com
* tests/classes/inheritance_007.phpt
@@ -37779,7 +37828,7 @@
* sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapilib.c:
- - Added missing $Id: ChangeLog,v 1.3388 2009/04/29 01:32:44 changelog
Exp $ tags and nuked c++ comments
+ - Added missing $Id: ChangeLog,v 1.3389 2009/04/30 01:32:42 changelog
Exp $ tags and nuked c++ comments
* (PHP_5_3)
ext/intl/locale/locale.c
[PHP-CVS] cvs: php-src /ext/standard/tests/strings strcoll.phpt
zoe Wed Apr 29 07:49:45 2009 UTC
Modified files:
/php-src/ext/standard/tests/strings strcoll.phpt
Log:
Refixing to follow documented behaviour
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strcoll.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/strings/strcoll.phpt
diff -u php-src/ext/standard/tests/strings/strcoll.phpt:1.3
php-src/ext/standard/tests/strings/strcoll.phpt:1.4
--- php-src/ext/standard/tests/strings/strcoll.phpt:1.3 Tue Apr 28 09:05:25 2009
+++ php-src/ext/standard/tests/strings/strcoll.phpt Wed Apr 29 07:49:45 2009
@@ -11,8 +11,11 @@
$b = 'A';
setlocale (LC_COLLATE, 'C');
-print C: . strcoll ($a, $b) . \n; // prints 32
+$result = strcoll($a, $b);
+if($result 0) {
+ echo Pass\n;
+}
?
---EXPECTF--
-Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale
functions in %s on line %d
-C: -1
+--EXPECT--
+Pass
+
--
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/strings strcoll.phpt
zoe Wed Apr 29 07:52:03 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings strcoll.phpt
Log:
Refixing to follow documented behaviour
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strcoll.phpt?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/standard/tests/strings/strcoll.phpt
diff -u php-src/ext/standard/tests/strings/strcoll.phpt:1.2.2.3
php-src/ext/standard/tests/strings/strcoll.phpt:1.2.2.4
--- php-src/ext/standard/tests/strings/strcoll.phpt:1.2.2.3 Tue Apr 28
09:04:17 2009
+++ php-src/ext/standard/tests/strings/strcoll.phpt Wed Apr 29 07:52:03 2009
@@ -11,7 +11,11 @@
$b = 'A';
setlocale (LC_COLLATE, 'C');
-print C: . strcoll ($a, $b) . \n; // prints 32
+$result = strcoll($a, $b);
+if($result 0) {
+ echo Pass\n;
+}
?
--EXPECT--
-C: 32
+Pass
+
--
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 strcoll.phpt
zoe Wed Apr 29 07:53:10 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings strcoll.phpt
Log:
Refixing to follow documented behaviour
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strcoll.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/strings/strcoll.phpt
diff -u php-src/ext/standard/tests/strings/strcoll.phpt:1.1.2.2
php-src/ext/standard/tests/strings/strcoll.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strcoll.phpt:1.1.2.2 Tue Apr 28
09:04:28 2009
+++ php-src/ext/standard/tests/strings/strcoll.phpt Wed Apr 29 07:53:10 2009
@@ -11,7 +11,11 @@
$b = 'A';
setlocale (LC_COLLATE, 'C');
-print C: . strcoll ($a, $b) . \n; // prints 32
+$result = strcoll($a, $b);
+if($result 0) {
+ echo Pass\n;
+}
?
--EXPECT--
-C: 32
+Pass
+
--
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) /ext/phar phar.c phar_internal.h phar_object.c tar.c util.c zip.c
On 29.04.2009 07:24, Greg Beaver wrote:
cellogWed Apr 29 03:24:27 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar.c phar_internal.h phar_object.c tar.c util.c
zip.c
Log:
MFPECL: fix PECL bug #16338, php_stream_copy_to_stream{,_ex}()
This patch has introduced a segfault with the following backtrace:
(gdb) bt
#0 0x009792be in _zval_ptr_dtor (zval_ptr=0x7fffe327b890,
__zend_filename=0xedb8f0 /local/qa/5_3.zts/ext/phar/phar_object.c,
__zend_lineno=316)
at /local/qa/5_3.zts/Zend/zend.h:392
#1 0x006b9d3a in phar_file_action (phar=0x153d998, info=0x153bd50,
mime_type=0xed7ecd , code=0, entry=0x153c070 /index.php, entry_len=10,
arch=0x1520a98 /local/qa/5_3.zts/ext/phar/tests/fatal_error_webphar.php,
basename=0x153c0d8 retrieveProjectCoverage, ru=0x0, ru_len=0,
tsrm_ls=0x12291b0) at /local/qa/5_3.zts/ext/phar/phar_object.c:316
#2 0x006bbd48 in zim_Phar_webPhar (ht=1, return_value=0x153ac50,
return_value_ptr=0x0, this_ptr=0x0, return_value_used=0, tsrm_ls=0x12291b0)
at /local/qa/5_3.zts/ext/phar/phar_object.c:878
#3 0x009c99bf in zend_do_fcall_common_helper_SPEC
(execute_data=0x7ff3db14e098, tsrm_ls=0x12291b0) at
/local/qa/5_3.zts/Zend/zend_vm_execute.h:313
#4 0x009cb011 in ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER
(execute_data=0x7ff3db14e098, tsrm_ls=0x12291b0)
at /local/qa/5_3.zts/Zend/zend_vm_execute.h:422
#5 0x009c81a4 in execute (op_array=0x153a930, tsrm_ls=0x12291b0) at
/local/qa/5_3.zts/Zend/zend_vm_execute.h:104
#6 0x0098f4a6 in zend_execute_scripts (type=8, tsrm_ls=0x12291b0,
retval=0x0, file_count=3) at /local/qa/5_3.zts/Zend/zend.c:1188
#7 0x008d95f4 in php_execute_script (primary_file=0x7fffe3282620,
tsrm_ls=0x12291b0) at /local/qa/5_3.zts/main/main.c:2166
#8 0x00a9ee45 in main (argc=65, argv=0x7fffe3282848) at
/local/qa/5_3.zts/sapi/cgi/cgi_main.c:2015
Unfortunately, I'm unable to tell now which test causes it, but hopefully
Valgrind will tell me in an hour or so.
--
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(PHP_5_3) /ext/phar phar.c phar_internal.h phar_object.c tar.c util.c zip.c
On 29.04.2009 07:24, Greg Beaver wrote:
cellogWed Apr 29 03:24:27 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar.c phar_internal.h phar_object.c tar.c util.c
zip.c
Log:
MFPECL: fix PECL bug #16338, php_stream_copy_to_stream{,_ex}()
ext/phar/tests/fatal_error_webphar.mem
==29591== Invalid read of size 8
==29591==at 0x693B8A: phar_file_action (phar_object.c:315)
==29591==by 0x6956D1: zim_Phar_webPhar (phar_object.c:878)
==29591==by 0x9203BE: zend_do_fcall_common_helper_SPEC
(zend_vm_execute.h:313)
==29591==by 0x921103: ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER
(zend_vm_execute.h:422)
==29591==by 0x91F64E: execute (zend_vm_execute.h:104)
==29591==by 0x8F08C2: zend_execute_scripts (zend.c:1188)
==29591==by 0x87BD7B: php_execute_script (main.c:2166)
==29591==by 0x9D691F: main (cgi_main.c:2015)
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib timezonedb.h
derick Wed Apr 29 11:11:53 2009 UTC Modified files: /php-src/ext/date/lib timezonedb.h Log: - Updated to version 2009.7 (2009g) http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timezonedb.h?r1=1.41r2=1.42diff_format=u Index: php-src/ext/date/lib/timezonedb.h diff -u php-src/ext/date/lib/timezonedb.h:1.41 php-src/ext/date/lib/timezonedb.h:1.42 --- php-src/ext/date/lib/timezonedb.h:1.41 Mon Apr 13 13:40:49 2009 +++ php-src/ext/date/lib/timezonedb.h Wed Apr 29 11:11:52 2009 @@ -722,21 +722,21 @@ 0x3F, 0x73, 0x57, 0x50, 0x40, 0x91, 0x7A, 0xE0, 0x41, 0x5C, 0x73, 0xD0, 0x42, 0x71, 0x5C, 0xE0, 0x43, 0x3C, 0x55, 0xD0, 0x44, 0x51, 0x3E, 0xE0, 0x45, 0x12, 0xFD, 0x50, 0x46, 0x31, 0x20, 0xE0, 0x46, 0xE0, 0x6A, 0x50, 0x48, 0x11, 0x02, 0xE0, 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xF0, 0xE4, 0xE0, -0x4A, 0x96, 0xF3, 0xD0, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0x76, 0xD5, 0xD0, 0x4D, 0xB9, 0xE3, 0x60, -0x4E, 0x56, 0xB7, 0xD0, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x3F, 0xD4, 0x50, 0x51, 0x79, 0xA7, 0x60, -0x52, 0x1F, 0xB6, 0x50, 0x53, 0x59, 0x89, 0x60, 0x53, 0xFF, 0x98, 0x50, 0x55, 0x39, 0x6B, 0x60, -0x55, 0xDF, 0x7A, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xBF, 0x5C, 0x50, 0x59, 0x02, 0x69, 0xE0, -0x59, 0xA8, 0x78, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0x88, 0x5A, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0, -0x5D, 0x68, 0x3C, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, 0x5F, 0x48, 0x1E, 0xD0, 0x60, 0x8B, 0x2C, 0x60, -0x61, 0x28, 0x00, 0xD0, 0x62, 0x6B, 0x0E, 0x60, 0x63, 0x07, 0xE2, 0xD0, 0x64, 0x4A, 0xF0, 0x60, -0x64, 0xF0, 0xFF, 0x50, 0x66, 0x2A, 0xD2, 0x60, 0x66, 0xD0, 0xE1, 0x50, 0x68, 0x0A, 0xB4, 0x60, -0x68, 0xB0, 0xC3, 0x50, 0x69, 0xEA, 0x96, 0x60, 0x6A, 0x90, 0xA5, 0x50, 0x6B, 0xD3, 0xB2, 0xE0, -0x6C, 0x70, 0x87, 0x50, 0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0x59, 0xA3, 0xD0, 0x6F, 0x93, 0x76, 0xE0, -0x70, 0x39, 0x85, 0xD0, 0x71, 0x73, 0x58, 0xE0, 0x72, 0x19, 0x67, 0xD0, 0x73, 0x53, 0x3A, 0xE0, -0x73, 0xF9, 0x49, 0xD0, 0x75, 0x3C, 0x57, 0x60, 0x75, 0xD9, 0x2B, 0xD0, 0x77, 0x1C, 0x39, 0x60, -0x77, 0xB9, 0x0D, 0xD0, 0x78, 0xFC, 0x1B, 0x60, 0x79, 0xA2, 0x2A, 0x50, 0x7A, 0xDB, 0xFD, 0x60, -0x7B, 0x82, 0x0C, 0x50, 0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0x61, 0xEE, 0x50, 0x7E, 0x9B, 0xC1, 0x60, -0x7F, 0x41, 0xD0, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, +0x4A, 0xBB, 0xDD, 0xD0, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0xA4, 0xFA, 0x50, 0x4D, 0xB9, 0xE3, 0x60, +0x4E, 0x84, 0xDC, 0x50, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x64, 0xBE, 0x50, 0x51, 0x79, 0xA7, 0x60, +0x52, 0x44, 0xA0, 0x50, 0x53, 0x59, 0x89, 0x60, 0x54, 0x24, 0x82, 0x50, 0x55, 0x39, 0x6B, 0x60, +0x56, 0x04, 0x64, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xED, 0x80, 0xD0, 0x59, 0x02, 0x69, 0xE0, +0x59, 0xCD, 0x62, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0xAD, 0x44, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0, +0x5D, 0x8D, 0x26, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, 0x5F, 0x6D, 0x08, 0xD0, 0x60, 0x8B, 0x2C, 0x60, +0x61, 0x56, 0x25, 0x50, 0x62, 0x6B, 0x0E, 0x60, 0x63, 0x36, 0x07, 0x50, 0x64, 0x4A, 0xF0, 0x60, +0x65, 0x15, 0xE9, 0x50, 0x66, 0x2A, 0xD2, 0x60, 0x66, 0xF5, 0xCB, 0x50, 0x68, 0x0A, 0xB4, 0x60, +0x68, 0xD5, 0xAD, 0x50, 0x69, 0xEA, 0x96, 0x60, 0x6A, 0xB5, 0x8F, 0x50, 0x6B, 0xD3, 0xB2, 0xE0, +0x6C, 0x9E, 0xAB, 0xD0, 0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0x7E, 0x8D, 0xD0, 0x6F, 0x93, 0x76, 0xE0, +0x70, 0x5E, 0x6F, 0xD0, 0x71, 0x73, 0x58, 0xE0, 0x72, 0x3E, 0x51, 0xD0, 0x73, 0x53, 0x3A, 0xE0, +0x74, 0x1E, 0x33, 0xD0, 0x75, 0x3C, 0x57, 0x60, 0x76, 0x07, 0x50, 0x50, 0x77, 0x1C, 0x39, 0x60, +0x77, 0xE7, 0x32, 0x50, 0x78, 0xFC, 0x1B, 0x60, 0x79, 0xC7, 0x14, 0x50, 0x7A, 0xDB, 0xFD, 0x60, +0x7B, 0xA6, 0xF6, 0x50, 0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0x86, 0xD8, 0x50, 0x7E, 0x9B, 0xC1, 0x60, +0x7F, 0x66, 0xBA, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, @@ -11697,21 +11697,21 @@ 0x3F, 0x73, 0x57, 0x50, 0x40, 0x91, 0x7A, 0xE0, 0x41, 0x5C, 0x73, 0xD0, 0x42, 0x71, 0x5C, 0xE0, 0x43, 0x3C, 0x55, 0xD0, 0x44, 0x51, 0x3E, 0xE0, 0x45, 0x12, 0xFD, 0x50, 0x46, 0x31, 0x20, 0xE0, 0x46, 0xE0, 0x6A, 0x50, 0x48, 0x11, 0x02, 0xE0, 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xF0, 0xE4, 0xE0, -0x4A, 0x96, 0xF3, 0xD0, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0x76, 0xD5, 0xD0, 0x4D, 0xB9, 0xE3, 0x60, -0x4E, 0x56, 0xB7, 0xD0, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x3F, 0xD4, 0x50, 0x51, 0x79, 0xA7, 0x60, -0x52, 0x1F, 0xB6, 0x50, 0x53, 0x59, 0x89, 0x60, 0x53, 0xFF, 0x98, 0x50, 0x55, 0x39, 0x6B, 0x60, -0x55, 0xDF, 0x7A, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xBF, 0x5C, 0x50, 0x59, 0x02, 0x69, 0xE0, -0x59, 0xA8, 0x78, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0x88, 0x5A, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0, -0x5D, 0x68, 0x3C, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, 0x5F, 0x48,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/lib timezonedb.h
derick Wed Apr 29 11:12:05 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date/lib timezonedb.h Log: - Updated to version 2009.7 (2009g) http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timezonedb.h?r1=1.4.2.7.2.10.2.19r2=1.4.2.7.2.10.2.20diff_format=u Index: php-src/ext/date/lib/timezonedb.h diff -u php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.10.2.19 php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.10.2.20 --- php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.10.2.19 Mon Apr 13 13:41:15 2009 +++ php-src/ext/date/lib/timezonedb.h Wed Apr 29 11:12:03 2009 @@ -722,21 +722,21 @@ 0x3F, 0x73, 0x57, 0x50, 0x40, 0x91, 0x7A, 0xE0, 0x41, 0x5C, 0x73, 0xD0, 0x42, 0x71, 0x5C, 0xE0, 0x43, 0x3C, 0x55, 0xD0, 0x44, 0x51, 0x3E, 0xE0, 0x45, 0x12, 0xFD, 0x50, 0x46, 0x31, 0x20, 0xE0, 0x46, 0xE0, 0x6A, 0x50, 0x48, 0x11, 0x02, 0xE0, 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xF0, 0xE4, 0xE0, -0x4A, 0x96, 0xF3, 0xD0, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0x76, 0xD5, 0xD0, 0x4D, 0xB9, 0xE3, 0x60, -0x4E, 0x56, 0xB7, 0xD0, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x3F, 0xD4, 0x50, 0x51, 0x79, 0xA7, 0x60, -0x52, 0x1F, 0xB6, 0x50, 0x53, 0x59, 0x89, 0x60, 0x53, 0xFF, 0x98, 0x50, 0x55, 0x39, 0x6B, 0x60, -0x55, 0xDF, 0x7A, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xBF, 0x5C, 0x50, 0x59, 0x02, 0x69, 0xE0, -0x59, 0xA8, 0x78, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0x88, 0x5A, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0, -0x5D, 0x68, 0x3C, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, 0x5F, 0x48, 0x1E, 0xD0, 0x60, 0x8B, 0x2C, 0x60, -0x61, 0x28, 0x00, 0xD0, 0x62, 0x6B, 0x0E, 0x60, 0x63, 0x07, 0xE2, 0xD0, 0x64, 0x4A, 0xF0, 0x60, -0x64, 0xF0, 0xFF, 0x50, 0x66, 0x2A, 0xD2, 0x60, 0x66, 0xD0, 0xE1, 0x50, 0x68, 0x0A, 0xB4, 0x60, -0x68, 0xB0, 0xC3, 0x50, 0x69, 0xEA, 0x96, 0x60, 0x6A, 0x90, 0xA5, 0x50, 0x6B, 0xD3, 0xB2, 0xE0, -0x6C, 0x70, 0x87, 0x50, 0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0x59, 0xA3, 0xD0, 0x6F, 0x93, 0x76, 0xE0, -0x70, 0x39, 0x85, 0xD0, 0x71, 0x73, 0x58, 0xE0, 0x72, 0x19, 0x67, 0xD0, 0x73, 0x53, 0x3A, 0xE0, -0x73, 0xF9, 0x49, 0xD0, 0x75, 0x3C, 0x57, 0x60, 0x75, 0xD9, 0x2B, 0xD0, 0x77, 0x1C, 0x39, 0x60, -0x77, 0xB9, 0x0D, 0xD0, 0x78, 0xFC, 0x1B, 0x60, 0x79, 0xA2, 0x2A, 0x50, 0x7A, 0xDB, 0xFD, 0x60, -0x7B, 0x82, 0x0C, 0x50, 0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0x61, 0xEE, 0x50, 0x7E, 0x9B, 0xC1, 0x60, -0x7F, 0x41, 0xD0, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, +0x4A, 0xBB, 0xDD, 0xD0, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0xA4, 0xFA, 0x50, 0x4D, 0xB9, 0xE3, 0x60, +0x4E, 0x84, 0xDC, 0x50, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x64, 0xBE, 0x50, 0x51, 0x79, 0xA7, 0x60, +0x52, 0x44, 0xA0, 0x50, 0x53, 0x59, 0x89, 0x60, 0x54, 0x24, 0x82, 0x50, 0x55, 0x39, 0x6B, 0x60, +0x56, 0x04, 0x64, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xED, 0x80, 0xD0, 0x59, 0x02, 0x69, 0xE0, +0x59, 0xCD, 0x62, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0xAD, 0x44, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0, +0x5D, 0x8D, 0x26, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, 0x5F, 0x6D, 0x08, 0xD0, 0x60, 0x8B, 0x2C, 0x60, +0x61, 0x56, 0x25, 0x50, 0x62, 0x6B, 0x0E, 0x60, 0x63, 0x36, 0x07, 0x50, 0x64, 0x4A, 0xF0, 0x60, +0x65, 0x15, 0xE9, 0x50, 0x66, 0x2A, 0xD2, 0x60, 0x66, 0xF5, 0xCB, 0x50, 0x68, 0x0A, 0xB4, 0x60, +0x68, 0xD5, 0xAD, 0x50, 0x69, 0xEA, 0x96, 0x60, 0x6A, 0xB5, 0x8F, 0x50, 0x6B, 0xD3, 0xB2, 0xE0, +0x6C, 0x9E, 0xAB, 0xD0, 0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0x7E, 0x8D, 0xD0, 0x6F, 0x93, 0x76, 0xE0, +0x70, 0x5E, 0x6F, 0xD0, 0x71, 0x73, 0x58, 0xE0, 0x72, 0x3E, 0x51, 0xD0, 0x73, 0x53, 0x3A, 0xE0, +0x74, 0x1E, 0x33, 0xD0, 0x75, 0x3C, 0x57, 0x60, 0x76, 0x07, 0x50, 0x50, 0x77, 0x1C, 0x39, 0x60, +0x77, 0xE7, 0x32, 0x50, 0x78, 0xFC, 0x1B, 0x60, 0x79, 0xC7, 0x14, 0x50, 0x7A, 0xDB, 0xFD, 0x60, +0x7B, 0xA6, 0xF6, 0x50, 0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0x86, 0xD8, 0x50, 0x7E, 0x9B, 0xC1, 0x60, +0x7F, 0x66, 0xBA, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, @@ -11697,21 +11697,21 @@ 0x3F, 0x73, 0x57, 0x50, 0x40, 0x91, 0x7A, 0xE0, 0x41, 0x5C, 0x73, 0xD0, 0x42, 0x71, 0x5C, 0xE0, 0x43, 0x3C, 0x55, 0xD0, 0x44, 0x51, 0x3E, 0xE0, 0x45, 0x12, 0xFD, 0x50, 0x46, 0x31, 0x20, 0xE0, 0x46, 0xE0, 0x6A, 0x50, 0x48, 0x11, 0x02, 0xE0, 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xF0, 0xE4, 0xE0, -0x4A, 0x96, 0xF3, 0xD0, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0x76, 0xD5, 0xD0, 0x4D, 0xB9, 0xE3, 0x60, -0x4E, 0x56, 0xB7, 0xD0, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x3F, 0xD4, 0x50, 0x51, 0x79, 0xA7, 0x60, -0x52, 0x1F, 0xB6, 0x50, 0x53, 0x59, 0x89, 0x60, 0x53, 0xFF, 0x98, 0x50, 0x55, 0x39, 0x6B, 0x60, -0x55, 0xDF, 0x7A, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xBF, 0x5C, 0x50, 0x59, 0x02, 0x69, 0xE0, -0x59, 0xA8, 0x78, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0x88, 0x5A, 0xD0, 0x5C, 0xC2,
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date/lib timezonedb.h
derick Wed Apr 29 11:12:15 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/date/lib timezonedb.h Log: - Updated to version 2009.7 (2009g) http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timezonedb.h?r1=1.4.2.7.2.29r2=1.4.2.7.2.30diff_format=u Index: php-src/ext/date/lib/timezonedb.h diff -u php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.29 php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.30 --- php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.29 Mon Apr 13 13:41:47 2009 +++ php-src/ext/date/lib/timezonedb.h Wed Apr 29 11:12:13 2009 @@ -722,21 +722,21 @@ 0x3F, 0x73, 0x57, 0x50, 0x40, 0x91, 0x7A, 0xE0, 0x41, 0x5C, 0x73, 0xD0, 0x42, 0x71, 0x5C, 0xE0, 0x43, 0x3C, 0x55, 0xD0, 0x44, 0x51, 0x3E, 0xE0, 0x45, 0x12, 0xFD, 0x50, 0x46, 0x31, 0x20, 0xE0, 0x46, 0xE0, 0x6A, 0x50, 0x48, 0x11, 0x02, 0xE0, 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xF0, 0xE4, 0xE0, -0x4A, 0x96, 0xF3, 0xD0, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0x76, 0xD5, 0xD0, 0x4D, 0xB9, 0xE3, 0x60, -0x4E, 0x56, 0xB7, 0xD0, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x3F, 0xD4, 0x50, 0x51, 0x79, 0xA7, 0x60, -0x52, 0x1F, 0xB6, 0x50, 0x53, 0x59, 0x89, 0x60, 0x53, 0xFF, 0x98, 0x50, 0x55, 0x39, 0x6B, 0x60, -0x55, 0xDF, 0x7A, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xBF, 0x5C, 0x50, 0x59, 0x02, 0x69, 0xE0, -0x59, 0xA8, 0x78, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0x88, 0x5A, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0, -0x5D, 0x68, 0x3C, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, 0x5F, 0x48, 0x1E, 0xD0, 0x60, 0x8B, 0x2C, 0x60, -0x61, 0x28, 0x00, 0xD0, 0x62, 0x6B, 0x0E, 0x60, 0x63, 0x07, 0xE2, 0xD0, 0x64, 0x4A, 0xF0, 0x60, -0x64, 0xF0, 0xFF, 0x50, 0x66, 0x2A, 0xD2, 0x60, 0x66, 0xD0, 0xE1, 0x50, 0x68, 0x0A, 0xB4, 0x60, -0x68, 0xB0, 0xC3, 0x50, 0x69, 0xEA, 0x96, 0x60, 0x6A, 0x90, 0xA5, 0x50, 0x6B, 0xD3, 0xB2, 0xE0, -0x6C, 0x70, 0x87, 0x50, 0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0x59, 0xA3, 0xD0, 0x6F, 0x93, 0x76, 0xE0, -0x70, 0x39, 0x85, 0xD0, 0x71, 0x73, 0x58, 0xE0, 0x72, 0x19, 0x67, 0xD0, 0x73, 0x53, 0x3A, 0xE0, -0x73, 0xF9, 0x49, 0xD0, 0x75, 0x3C, 0x57, 0x60, 0x75, 0xD9, 0x2B, 0xD0, 0x77, 0x1C, 0x39, 0x60, -0x77, 0xB9, 0x0D, 0xD0, 0x78, 0xFC, 0x1B, 0x60, 0x79, 0xA2, 0x2A, 0x50, 0x7A, 0xDB, 0xFD, 0x60, -0x7B, 0x82, 0x0C, 0x50, 0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0x61, 0xEE, 0x50, 0x7E, 0x9B, 0xC1, 0x60, -0x7F, 0x41, 0xD0, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, +0x4A, 0xBB, 0xDD, 0xD0, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0xA4, 0xFA, 0x50, 0x4D, 0xB9, 0xE3, 0x60, +0x4E, 0x84, 0xDC, 0x50, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x64, 0xBE, 0x50, 0x51, 0x79, 0xA7, 0x60, +0x52, 0x44, 0xA0, 0x50, 0x53, 0x59, 0x89, 0x60, 0x54, 0x24, 0x82, 0x50, 0x55, 0x39, 0x6B, 0x60, +0x56, 0x04, 0x64, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xED, 0x80, 0xD0, 0x59, 0x02, 0x69, 0xE0, +0x59, 0xCD, 0x62, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0xAD, 0x44, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0, +0x5D, 0x8D, 0x26, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, 0x5F, 0x6D, 0x08, 0xD0, 0x60, 0x8B, 0x2C, 0x60, +0x61, 0x56, 0x25, 0x50, 0x62, 0x6B, 0x0E, 0x60, 0x63, 0x36, 0x07, 0x50, 0x64, 0x4A, 0xF0, 0x60, +0x65, 0x15, 0xE9, 0x50, 0x66, 0x2A, 0xD2, 0x60, 0x66, 0xF5, 0xCB, 0x50, 0x68, 0x0A, 0xB4, 0x60, +0x68, 0xD5, 0xAD, 0x50, 0x69, 0xEA, 0x96, 0x60, 0x6A, 0xB5, 0x8F, 0x50, 0x6B, 0xD3, 0xB2, 0xE0, +0x6C, 0x9E, 0xAB, 0xD0, 0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0x7E, 0x8D, 0xD0, 0x6F, 0x93, 0x76, 0xE0, +0x70, 0x5E, 0x6F, 0xD0, 0x71, 0x73, 0x58, 0xE0, 0x72, 0x3E, 0x51, 0xD0, 0x73, 0x53, 0x3A, 0xE0, +0x74, 0x1E, 0x33, 0xD0, 0x75, 0x3C, 0x57, 0x60, 0x76, 0x07, 0x50, 0x50, 0x77, 0x1C, 0x39, 0x60, +0x77, 0xE7, 0x32, 0x50, 0x78, 0xFC, 0x1B, 0x60, 0x79, 0xC7, 0x14, 0x50, 0x7A, 0xDB, 0xFD, 0x60, +0x7B, 0xA6, 0xF6, 0x50, 0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0x86, 0xD8, 0x50, 0x7E, 0x9B, 0xC1, 0x60, +0x7F, 0x66, 0xBA, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, @@ -11697,21 +11697,21 @@ 0x3F, 0x73, 0x57, 0x50, 0x40, 0x91, 0x7A, 0xE0, 0x41, 0x5C, 0x73, 0xD0, 0x42, 0x71, 0x5C, 0xE0, 0x43, 0x3C, 0x55, 0xD0, 0x44, 0x51, 0x3E, 0xE0, 0x45, 0x12, 0xFD, 0x50, 0x46, 0x31, 0x20, 0xE0, 0x46, 0xE0, 0x6A, 0x50, 0x48, 0x11, 0x02, 0xE0, 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xF0, 0xE4, 0xE0, -0x4A, 0x96, 0xF3, 0xD0, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0x76, 0xD5, 0xD0, 0x4D, 0xB9, 0xE3, 0x60, -0x4E, 0x56, 0xB7, 0xD0, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x3F, 0xD4, 0x50, 0x51, 0x79, 0xA7, 0x60, -0x52, 0x1F, 0xB6, 0x50, 0x53, 0x59, 0x89, 0x60, 0x53, 0xFF, 0x98, 0x50, 0x55, 0x39, 0x6B, 0x60, -0x55, 0xDF, 0x7A, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xBF, 0x5C, 0x50, 0x59, 0x02, 0x69, 0xE0, -0x59, 0xA8, 0x78, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0x88, 0x5A, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0, -0x5D,
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard basic_functions.c /ext/standard/tests/network ip2long_variation1.phpt
Hi Ilia
2009/4/29 Ilia Alshanetsky il...@php.net:
iliaa Tue Apr 28 22:31:26 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard basic_functions.c
/php-src/ext/standard/tests/network ip2long_variation1.phpt
/php-src NEWS
Log:
MFB: Fixed bug #47365 (ip2long() may allow some invalid values on certain
64bit systems)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.80r2=1.725.2.31.2.81diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.80
php-src/ext/standard/basic_functions.c:1.725.2.31.2.81
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.80 Wed Dec 31
11:17:44 2008
+++ php-src/ext/standard/basic_functions.c Tue Apr 28 22:31:25 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.80 2008/12/31 11:17:44 sebastian
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.81 2009/04/28 22:31:25 iliaa Exp $
*/
#include php.h
#include php_streams.h
@@ -4329,38 +4329,45 @@
/* }}} */
#endif /* HAVE_INET_PTON */
-
-
/* {{{ proto int ip2long(string ip_address)
Converts a string containing an (IPv4) Internet Protocol dotted address
into a proper address */
PHP_FUNCTION(ip2long)
{
- zval **str;
+ char *addr;
+ int addr_len;
+#ifdef HAVE_INET_PTON
+ struct in_addr ip;
+#else
unsigned long int ip;
+#endif
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, str) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, addr,
addr_len) == FAILURE) {
+ return;
}
This breaks some of the tests because they rely on the old parameter
parsing API in 5_2 (Thanks Antony):
ext/standard/tests/network/ip2long_error.phpt
ext/standard/tests/network/ip2long_variation1.phpt
- convert_to_string_ex(str);
-
- if (Z_STRLEN_PP(str) == 0 || (ip = inet_addr(Z_STRVAL_PP(str))) ==
INADDR_NONE) {
- /* the only special case when we should return -1 ourselves,
+#ifdef HAVE_INET_PTON
+ if (addr_len == 0 || inet_pton(AF_INET, addr, ip) != 1) {
+ RETURN_FALSE;
+ }
+ RETURN_LONG(ntohl(ip.s_addr));
+#else
+ if (addr_len == 0 || (ip = inet_addr(addr)) == INADDR_NONE) {
+ /* The only special case when we should return -1 ourselves,
* because inet_addr() considers it wrong. We return
0x and
- * not -1 or ~0 because of 32/64bit issues.
- */
- if (Z_STRLEN_PP(str) == sizeof(255.255.255.255) - 1
- !memcmp(Z_STRVAL_PP(str), 255.255.255.255,
sizeof(255.255.255.255) - 1)) {
+ * not -1 or ~0 because of 32/64bit issues. */
+ if (addr_len == sizeof(255.255.255.255) - 1
+ !memcmp(addr, 255.255.255.255,
sizeof(255.255.255.255) - 1)
+ ) {
RETURN_LONG(0x);
}
-
RETURN_FALSE;
}
-
RETURN_LONG(ntohl(ip));
+#endif
}
/* }}} */
+
--
Kalle Sommer Nielsen
ka...@php.net
--
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) /ext/phar phar.c phar_internal.h phar_object.c tar.c util.c zip.c
Antony Dovgal wrote:
On 29.04.2009 07:24, Greg Beaver wrote:
cellog Wed Apr 29 03:24:27 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pharphar.c phar_internal.h phar_object.c tar.c
util.c
zip.c
Log:
MFPECL: fix PECL bug #16338, php_stream_copy_to_stream{,_ex}()
ext/phar/tests/fatal_error_webphar.mem
==29591== Invalid read of size 8
==29591==at 0x693B8A: phar_file_action (phar_object.c:315)
==29591==by 0x6956D1: zim_Phar_webPhar (phar_object.c:878)
==29591==by 0x9203BE: zend_do_fcall_common_helper_SPEC
(zend_vm_execute.h:313)
==29591==by 0x921103: ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER
(zend_vm_execute.h:422)
==29591==by 0x91F64E: execute (zend_vm_execute.h:104)
==29591==by 0x8F08C2: zend_execute_scripts (zend.c:1188)
==29591==by 0x87BD7B: php_execute_script (main.c:2166)
==29591==by 0x9D691F: main (cgi_main.c:2015)
Oh good - you can reproduce it! The segfault is not related to the
commit, as you can see from the line in question (line 315 of
phar_file_action is a zval_ptr_dtor of EG(return_value_ptr_ptr), which
has nothing to do with streams).
I found this segfault on my system using apache 2.2 with the test script
and added the fatal_error_webphar test to attempt to reproduce it, but
the test in question passes using cgi on my system. Would you be able
to forward bt + valgrind errors to Dmitry? This is a ZE2 problem that
phar's cleanup triggers, and so I need to know how to rewrite the
cleanup so it doesn't trigger the segfault (or ZE2 needs to be fixed,
whichever is the real problem).
Thanks Tony,
Greg
--
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) /ext/phar phar.c phar_internal.h phar_object.c tar.c util.c zip.c
On 29.04.2009 17:50, Greg Beaver wrote: Oh good - you can reproduce it! The segfault is not related to the commit, as you can see from the line in question (line 315 of phar_file_action is a zval_ptr_dtor of EG(return_value_ptr_ptr), which has nothing to do with streams). Well, I don't remember seeing it before. I found this segfault on my system using apache 2.2 with the test script and added the fatal_error_webphar test to attempt to reproduce it, but the test in question passes using cgi on my system. It segfaults with CGI here (but no with CLI?). Would you be able to forward bt + valgrind errors to Dmitry? This is a ZE2 problem that phar's cleanup triggers, and so I need to know how to rewrite the cleanup so it doesn't trigger the segfault (or ZE2 needs to be fixed, whichever is the real problem). Ok, I'll ping him. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase/sections/configurationsections rtPostSection.php
zoe Wed Apr 29 17:29:56 2009 UTC
Modified files:
/phpruntests/src/testcase/sections/configurationsections
rtPostSection.php
Log:
correcting comments
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/configurationsections/rtPostSection.php?r1=1.2r2=1.3diff_format=u
Index: phpruntests/src/testcase/sections/configurationsections/rtPostSection.php
diff -u
phpruntests/src/testcase/sections/configurationsections/rtPostSection.php:1.2
phpruntests/src/testcase/sections/configurationsections/rtPostSection.php:1.3
---
phpruntests/src/testcase/sections/configurationsections/rtPostSection.php:1.2
Tue Apr 28 20:58:15 2009
+++ phpruntests/src/testcase/sections/configurationsections/rtPostSection.php
Wed Apr 29 17:29:56 2009
@@ -1,7 +1,7 @@
?php
/**
* rtPostSection
- * Sets environment variables for GET section
+ * Sets environment variables for POST section
*
*
* @category Testing
@@ -30,7 +30,7 @@
}
/**
- * Additional GET environment variables required by the test
+ * Additional POST environment variables required by the test
*
* @return array
*/
@@ -39,6 +39,10 @@
return $this-postVariables;
}
+/**
+ * return the name of teh file containing post data
+ *
+ */
public function getPostFileName()
{
return $this-postFileName;
--
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) /ext/phar phar.c phar_internal.h phar_object.c tar.c util.c zip.c
Antony Dovgal wrote: On 29.04.2009 17:50, Greg Beaver wrote: Oh good - you can reproduce it! The segfault is not related to the commit, as you can see from the line in question (line 315 of phar_file_action is a zval_ptr_dtor of EG(return_value_ptr_ptr), which has nothing to do with streams). Well, I don't remember seeing it before. Hi, This could be because the fatal_error_webphar.phpt test was committed only 1 day before the commit you did see? I found this segfault on my system using apache 2.2 with the test script and added the fatal_error_webphar test to attempt to reproduce it, but the test in question passes using cgi on my system. It segfaults with CGI here (but no with CLI?). It is a web-based test, which means it only runs with the CGI sapi. Would you be able to forward bt + valgrind errors to Dmitry? This is a ZE2 problem that phar's cleanup triggers, and so I need to know how to rewrite the cleanup so it doesn't trigger the segfault (or ZE2 needs to be fixed, whichever is the real problem). Ok, I'll ping him. thanks very much. I can get a backtrace using gdb, but no valgrind for the apache crash, although I haven't tried running the server via valgrind. Does anyone know if this is even possible to do with a forking server? Thanks, Greg -- 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) /ext/phar phar.c phar_internal.h phar_object.c tar.c util.c zip.c
Hi, On Wed, 2009-04-29 at 13:18 -0500, Greg Beaver wrote: I can get a backtrace using gdb, but no valgrind for the apache crash, although I haven't tried running the server via valgrind. Does anyone know if this is even possible to do with a forking server? Yes, you can try with valgrind apache2 -X. You can also run the FastCGI sapi under valgrind or gdb and make apache connect to it (so that you debug only php): USE_ZEND_ALLOC=0 valgrind php-cgi -b127.0.0.1:1234. Regards, Arnaud -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase/sections/configurationsections rtGzipPostSection.php
zoe Wed Apr 29 18:51:33 2009 UTC
Added files:
/phpruntests/src/testcase/sections/configurationsections
rtGzipPostSection.php
Log:
gzip post section class
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/configurationsections/rtGzipPostSection.php?view=markuprev=1.1
Index:
phpruntests/src/testcase/sections/configurationsections/rtGzipPostSection.php
+++
phpruntests/src/testcase/sections/configurationsections/rtGzipPostSection.php
?php
/**
* rtPostSection
* Sets environment variables for GZIP_POST section
*
*
* @category Testing
* @package RUNTESTS
* @authorZoe Slattery z...@php.net
* @authorStefan Priebsch sprieb...@php.net
* @copyright 2009 The PHP Group
* @license http://www.php.net/license/3_01.txt PHP License 3.01
* @link http://qa.php.net/
*/
class rtPostSection extends rtConfigurationSection
{
private $postVariables = array();
private $postFileName;
protected function init()
{
$postString = implode('\n', $this-sectionContents);
$gzipPostString = gzencode($postString);
$this-postVariables['CONTENT_TYPE'] =
'application/x-www-form-urlencoded';
$this-postVariables['CONTENT_LENGTH'] = strlen($gzipPostString);
$this-postVariables['REQUEST_METHOD'] = 'POST';
$this-postFileName = tempnam(sys_get_temp_dir(), 'post');
file_put_contents($this-postFileName, $postString);
}
/**
* Additional GET environment variables required by the test
*
* @return array
*/
public function getPostVariables()
{
return $this-postVariables;
}
public function getPostFileName()
{
return $this-postFileName;
}
}
?
--
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
iliaa Wed Apr 29 21:56:12 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: timezone db upgrade news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1479r2=1.2027.2.547.2.1480diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1479 php-src/NEWS:1.2027.2.547.2.1480 --- php-src/NEWS:1.2027.2.547.2.1479Tue Apr 28 22:31:25 2009 +++ php-src/NEWSWed Apr 29 21:56:12 2009 @@ -1,7 +1,7 @@ PHPNEWS ||| ?? ??? 2009, PHP 5.2.10 -- Updated timezone database to version 2009.5 (2009e) (Derick) +- Updated timezone database to version 2009.7 (2009g) (Derick) - Added new CURL options CURLOPT_REDIR_PROTOCOLS, CURLOPT_PROTOCOLS, and CURLPROTO_* for redirect fixes in CURL 7.19.4. (Yoram Bar Haim, Stas) -- 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 basic_functions.c /ext/standard/tests/network ip2long_error.phpt ip2long_variation1.phpt ip_x86_64.phpt long2ip_error.phpt long2ip_variation1.phpt
iliaa Wed Apr 29 22:06:28 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard basic_functions.c
/php-src/ext/standard/tests/network ip2long_error.phpt
ip2long_variation1.phpt
ip_x86_64.phpt
long2ip_error.phpt
long2ip_variation1.phpt
Log:
Update tests to accomodate new parameter parsing API and make long2ip() use
it as well
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.81r2=1.725.2.31.2.82diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.81
php-src/ext/standard/basic_functions.c:1.725.2.31.2.82
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.81 Tue Apr 28
22:31:25 2009
+++ php-src/ext/standard/basic_functions.c Wed Apr 29 22:06:28 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.81 2009/04/28 22:31:25 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.82 2009/04/29 22:06:28 iliaa Exp $ */
#include php.h
#include php_streams.h
@@ -4372,16 +4372,17 @@
Converts an (IPv4) Internet network address into a string in Internet
standard dotted format */
PHP_FUNCTION(long2ip)
{
- zval **num;
+ /* It's a long but it's not, PHP ints are signed */
+ char *ip;
+ int ip_len;
unsigned long n;
struct in_addr myaddr;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, num) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, ip, ip_len)
== FAILURE) {
+ return;
}
- convert_to_string_ex(num);
-
- n = strtoul(Z_STRVAL_PP(num), NULL, 0);
+
+ n = strtoul(ip, NULL, 0);
myaddr.s_addr = htonl(n);
RETURN_STRING(inet_ntoa(myaddr), 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/ip2long_error.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u
Index: php-src/ext/standard/tests/network/ip2long_error.phpt
diff -u php-src/ext/standard/tests/network/ip2long_error.phpt:1.2.2.2
php-src/ext/standard/tests/network/ip2long_error.phpt:1.2.2.3
--- php-src/ext/standard/tests/network/ip2long_error.phpt:1.2.2.2 Fri Jan
23 15:34:24 2009
+++ php-src/ext/standard/tests/network/ip2long_error.phpt Wed Apr 29
22:06:28 2009
@@ -27,11 +27,11 @@
-- Testing ip2long() function with Zero arguments --
-Warning: Wrong parameter count for ip2long() in %s on line %d
+Warning: ip2long() expects exactly 1 parameter, 0 given in %s on line %d
NULL
-- Testing ip2long() function with more than expected no. of arguments --
-Warning: Wrong parameter count for ip2long() in %s on line %d
+Warning: ip2long() expects exactly 1 parameter, 2 given in %s on line %d
NULL
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/ip2long_variation1.phpt?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/standard/tests/network/ip2long_variation1.phpt
diff -u php-src/ext/standard/tests/network/ip2long_variation1.phpt:1.2.2.3
php-src/ext/standard/tests/network/ip2long_variation1.phpt:1.2.2.4
--- php-src/ext/standard/tests/network/ip2long_variation1.phpt:1.2.2.3 Tue Apr
28 22:31:25 2009
+++ php-src/ext/standard/tests/network/ip2long_variation1.phpt Wed Apr 29
22:06:28 2009
@@ -141,20 +141,20 @@
bool(false)
--empty array--
-Error: 8 - Array to string conversion, %s(%d)
-bool(false)
+Error: 2 - ip2long() expects parameter 1 to be string, array given, %s(%d)
+NULL
--int indexed array--
-Error: 8 - Array to string conversion, %s(%d)
-bool(false)
+Error: 2 - ip2long() expects parameter 1 to be string, array given, %s(%d)
+NULL
--associative array--
-Error: 8 - Array to string conversion, %s(%d)
-bool(false)
+Error: 2 - ip2long() expects parameter 1 to be string, array given, %s(%d)
+NULL
--nested arrays--
-Error: 8 - Array to string conversion, %s(%d)
-bool(false)
+Error: 2 - ip2long() expects parameter 1 to be string, array given, %s(%d)
+NULL
--uppercase NULL--
bool(false)
@@ -184,9 +184,8 @@
bool(false)
--instance of classWithoutToString--
-Error: 4096 - Object of class classWithoutToString could not be converted to
string, %s(%d)
-Error: 8 - Object of class classWithoutToString to string conversion, %s(%d)
-bool(false)
+Error: 2 - ip2long() expects parameter 1 to be string, object given, %s(%d)
+NULL
--undefined var--
bool(false)
@@ -195,5 +194,6 @@
bool(false)
--resource--
-bool(false)
+Error: 2 - ip2long() expects parameter 1 to be string, resource given, %s(%d)
+NULL
===DONE===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/ip_x86_64.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index:
[PHP-CVS] cvs: php-src /ext/phar phar.c /ext/phar/tests phar_construct_invalidurl.phpt
cellog Thu Apr 30 04:40:31 2009 UTC
Added files:
/php-src/ext/phar/tests phar_construct_invalidurl.phpt
Modified files:
/php-src/ext/phar phar.c
Log:
MFPECL: fixed PECL Bug #14646: phar error message unclear with php stream
wrappers
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.397r2=1.398diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.397 php-src/ext/phar/phar.c:1.398
--- php-src/ext/phar/phar.c:1.397 Wed Apr 29 03:24:08 2009
+++ php-src/ext/phar/phar.c Thu Apr 30 04:40:31 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.397 2009/04/29 03:24:08 cellog Exp $ */
+/* $Id: phar.c,v 1.398 2009/04/30 04:40:31 cellog Exp $ */
#define PHAR_MAIN 1
#include phar_internal.h
@@ -1262,7 +1262,11 @@
/* next try to create a new file */
if (FAILURE == phar_detect_phar_fname_ext(fname, fname_len, ext_str,
ext_len, !is_data, 1, 1 TSRMLS_CC)) {
if (error) {
- spprintf(error, 0, Cannot create phar '%s', file
extension (or combination) not recognised, fname);
+ if (ext_len == -2) {
+ spprintf(error, 0, Cannot create a phar
archive from a URL like \%s\. Phar objects can only be created from local
files, fname);
+ } else {
+ spprintf(error, 0, Cannot create phar '%s',
file extension (or combination) not recognised, fname);
+ }
}
return FAILURE;
}
@@ -1903,6 +1907,12 @@
pos = memchr(filename, '/', filename_len);
if (pos pos != filename) {
+ /* check for url like http:// or phar:// */
+ if (*(pos - 1) == ':' (pos - filename) filename_len - 1
*(pos + 1) == '/') {
+ *ext_len = -2;
+ *ext_str = NULL;
+ return FAILURE;
+ }
if (zend_hash_exists((PHAR_GLOBALS-phar_alias_map), (char *)
filename, pos - filename)) {
*ext_str = pos;
*ext_len = -1;
@@ -3624,7 +3634,7 @@
php_info_print_table_header(2, Phar: PHP Archive support, enabled);
php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION);
php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, CVS revision, $Revision: 1.397 $);
+ php_info_print_table_row(2, CVS revision, $Revision: 1.398 $);
php_info_print_table_row(2, Phar-based phar archives, enabled);
php_info_print_table_row(2, Tar-based phar archives, enabled);
php_info_print_table_row(2, ZIP-based phar archives, enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_construct_invalidurl.phpt?view=markuprev=1.1
Index: php-src/ext/phar/tests/phar_construct_invalidurl.phpt
+++ php-src/ext/phar/tests/phar_construct_invalidurl.phpt
--TEST--
Phar object passed URL
--INI--
default_charset=UTF-8
--SKIPIF--
?php if (!extension_loaded(phar)) die(skip); ?
--FILE--
?php
try {
$a = new Phar('http://should.fail.com');
} catch (UnexpectedValueException $e) {
echo $e-getMessage(),\n;
}
try {
$a = new Phar('http://');
} catch (UnexpectedValueException $e) {
echo $e-getMessage(),\n;
}
try {
$a = new Phar('http:/');
} catch (UnexpectedValueException $e) {
echo $e-getMessage(),\n;
}
?
===DONE===
--EXPECT--
Cannot create a phar archive from a URL like http://should.fail.com;. Phar
objects can only be created from local files
Cannot create a phar archive from a URL like http://;. Phar objects can only
be created from local files
Cannot create phar 'http:/', file extension (or combination) not recognised
===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) / NEWS /ext/phar phar.c /ext/phar/tests phar_construct_invalidurl.phpt
cellog Thu Apr 30 04:43:10 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/phar/tests phar_construct_invalidurl.phpt
Modified files:
/php-srcNEWS
/php-src/ext/phar phar.c
Log:
MFPECL fix PECL Bug #14646: phar error message unclear with php stream
wrappers (note: is there a standard way to list PECL bugs in NEWS?)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.571r2=1.2027.2.547.2.965.2.572diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.571
php-src/NEWS:1.2027.2.547.2.965.2.572
--- php-src/NEWS:1.2027.2.547.2.965.2.571 Tue Apr 28 07:13:30 2009
+++ php-src/NEWSThu Apr 30 04:43:09 2009
@@ -53,6 +53,8 @@
update). (Matteo)
- Fixed bug #42362 (HTTP status codes 204 and 304 should not be gzipped).
(Scott, Edward Z. Yang)
+- Fixed PECL bug #16338 (phar extension uses php_stream_copy_to_stream). (Greg)
+- Fixed PECL bug #14646 (phar error message unclear with php stream wrappers).
(Greg)
- Fixed an issue with ReflectionProperty::setAccessible().
(Sebastian, Roman Borschel)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.59r2=1.370.2.60diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.59 php-src/ext/phar/phar.c:1.370.2.60
--- php-src/ext/phar/phar.c:1.370.2.59 Wed Apr 29 03:24:26 2009
+++ php-src/ext/phar/phar.c Thu Apr 30 04:43:10 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.370.2.59 2009/04/29 03:24:26 cellog Exp $ */
+/* $Id: phar.c,v 1.370.2.60 2009/04/30 04:43:10 cellog Exp $ */
#define PHAR_MAIN 1
#include phar_internal.h
@@ -1262,7 +1262,11 @@
/* next try to create a new file */
if (FAILURE == phar_detect_phar_fname_ext(fname, fname_len, ext_str,
ext_len, !is_data, 1, 1 TSRMLS_CC)) {
if (error) {
- spprintf(error, 0, Cannot create phar '%s', file
extension (or combination) not recognised, fname);
+ if (ext_len == -2) {
+ spprintf(error, 0, Cannot create a phar
archive from a URL like \%s\. Phar objects can only be created from local
files, fname);
+ } else {
+ spprintf(error, 0, Cannot create phar '%s',
file extension (or combination) not recognised, fname);
+ }
}
return FAILURE;
}
@@ -1903,6 +1907,12 @@
pos = memchr(filename, '/', filename_len);
if (pos pos != filename) {
+ /* check for url like http:// or phar:// */
+ if (*(pos - 1) == ':' (pos - filename) filename_len - 1
*(pos + 1) == '/') {
+ *ext_len = -2;
+ *ext_str = NULL;
+ return FAILURE;
+ }
if (zend_hash_exists((PHAR_GLOBALS-phar_alias_map), (char *)
filename, pos - filename)) {
*ext_str = pos;
*ext_len = -1;
@@ -3624,7 +3634,7 @@
php_info_print_table_header(2, Phar: PHP Archive support, enabled);
php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION);
php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.59 $);
+ php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.60 $);
php_info_print_table_row(2, Phar-based phar archives, enabled);
php_info_print_table_row(2, Tar-based phar archives, enabled);
php_info_print_table_row(2, ZIP-based phar archives, enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_construct_invalidurl.phpt?view=markuprev=1.1
Index: php-src/ext/phar/tests/phar_construct_invalidurl.phpt
+++ php-src/ext/phar/tests/phar_construct_invalidurl.phpt
--TEST--
Phar object passed URL
--INI--
default_charset=UTF-8
--SKIPIF--
?php if (!extension_loaded(phar)) die(skip); ?
--FILE--
?php
try {
$a = new Phar('http://should.fail.com');
} catch (UnexpectedValueException $e) {
echo $e-getMessage(),\n;
}
try {
$a = new Phar('http://');
} catch (UnexpectedValueException $e) {
echo $e-getMessage(),\n;
}
try {
$a = new Phar('http:/');
} catch (UnexpectedValueException $e) {
echo $e-getMessage(),\n;
}
?
===DONE===
--EXPECT--
Cannot create a phar archive from a URL like http://should.fail.com;. Phar
objects can only be created from local files
Cannot create a phar archive from a URL like http://;. Phar objects can only
be created from local files
Cannot create phar 'http:/', file extension (or combination) not recognised
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
