Re: [PHP-CVS] cvs: php-src /ext/openssl openssl.c
hi Scott,
How did you reproduce the crash (ssl version, and with which input or
config)? Please add a test case.
Also please keep an eye on the assign field of a bug report, it is
here for good reasons.
Cheers,
On Mon, Mar 30, 2009 at 1:32 AM, Scott MacVicar scott...@php.net wrote:
scottmac Sun Mar 29 23:32:17 2009 UTC
Modified files:
/php-src/ext/openssl openssl.c
Log:
Fix bug #47828 - Converting to UTF-8 can sometimes fail, check error codes
and avoid segfault.
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.179r2=1.180diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.179
php-src/ext/openssl/openssl.c:1.180
--- php-src/ext/openssl/openssl.c:1.179 Tue Mar 10 23:39:27 2009
+++ php-src/ext/openssl/openssl.c Sun Mar 29 23:32:17 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.179 2009/03/10 23:39:27 helly Exp $ */
+/* $Id: openssl.c,v 1.180 2009/03/29 23:32:17 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -557,10 +557,12 @@
str = X509_NAME_ENTRY_get_data(ne);
if (ASN1_STRING_type(str) !=
V_ASN1_UTF8STRING) {
to_add_len =
ASN1_STRING_to_UTF8(to_add, str);
-
add_next_index_utf8_stringl(subentries, (char *)to_add, to_add_len, 1);
} else {
to_add = ASN1_STRING_data(str);
to_add_len = ASN1_STRING_length(str);
+ }
+
+ if (to_add_len != -1) {
add_next_index_utf8_stringl(subentries, (char *)to_add, to_add_len, 1);
}
}
@@ -573,7 +575,7 @@
} else {
zval_dtor(subentries);
FREE_ZVAL(subentries);
- if (obj_cnt str) {
+ if (obj_cnt str to_add_len != -1) {
add_ascii_assoc_utf8_stringl(subitem, sname,
(char *)to_add, to_add_len, 1);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
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
Re: [PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c /ext/mysqlnd mysqlnd.c mysqlnd_debug.c mysqlnd_palloc.c mysqlnd_ps_codec.c mysqlnd_result.c mysqln
Hi Felipe, backport? If no backport to PHP5_3 please revert these changes and put the appropriate blocks in #ifdef blocks (PHP_MAJOR_VERSION). Please, do it. Because the code base should not change, harder to support with two branches.Thanks! Best, Andrey Felipe Pena wrote: felipe Fri Mar 27 19:28:27 2009 UTC Modified files: /php-src/ext/mysql php_mysql.c /php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c /php-src/ext/mysqlnd mysqlnd.c mysqlnd_debug.c mysqlnd_palloc.c mysqlnd_ps_codec.c mysqlnd_result.c mysqlnd_result_meta.c mysqlnd_statistics.c php_mysqlnd.c /php-src/ext/pcre php_pcre.c Log: - Removed: - UG(unicode) checks - Changed: - ZEND_STR_TYPE - IS_UNICODE - convert_to_text - convert_to_unicode -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c /ext/mysqlnd mysqlnd.c mysqlnd_debug.c mysqlnd_palloc.c mysqlnd_ps_codec.c mysqlnd_result.c mysqln
You probably mean just the mysqlnd changes, right? ext/mysql and ext/mysqli already contain bunch of differences between HEAD and 5.3. -Hannes On Mon, Mar 30, 2009 at 09:52, Andrey Hristov p...@hristov.com wrote: Hi Felipe, backport? If no backport to PHP5_3 please revert these changes and put the appropriate blocks in #ifdef blocks (PHP_MAJOR_VERSION). Please, do it. Because the code base should not change, harder to support with two branches.Thanks! Best, Andrey Felipe Pena wrote: felipe Fri Mar 27 19:28:27 2009 UTC Modified files: /php-src/ext/mysql php_mysql.c /php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c /php-src/ext/mysqlnd mysqlnd.c mysqlnd_debug.c mysqlnd_palloc.c mysqlnd_ps_codec.c mysqlnd_result.c mysqlnd_result_meta.c mysqlnd_statistics.c php_mysqlnd.c /php-src/ext/pcre php_pcre.c Log: - Removed: - UG(unicode) checks - Changed: - ZEND_STR_TYPE - IS_UNICODE - convert_to_text - convert_to_unicode -- 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_3) /ext/openssl/tests bug47828.phpt
scottmacMon Mar 30 09:17:57 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/openssl/tests bug47828.phpt Log: MFH Add test for bug #47828 http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug47828.phpt?view=markuprev=1.1 Index: php-src/ext/openssl/tests/bug47828.phpt +++ php-src/ext/openssl/tests/bug47828.phpt --TEST-- Bug #47828 (segfault with openssl_x509_parse()) --SKIPIF-- ?php if (!extension_loaded(openssl)) die(skip); ? --FILE-- ?php $certnl = '-BEGIN CERTIFICATE-\nMIIEKzCCAxOgAwIBAgICAtUwDQYJKoZIhvcNAQEFBQAwgewxFjAUBgNVBC0DDQBT\nUFI5NjEyMTdOSzkxETAPBgNVBAcTCENveW9hY+FuMQswCQYDVQQIEwJERjELMAkG\nA1UEBhMCTVgxDjAMBgNVBBETBTA0MDAwMR8wHQYDVQQJExZQYW56YWNvbGEgIzYy\nIDFlciBwaXNvMSgwJgYDVQQDEx9BdXRvcmlkYWQgY2VydGlmaWNhZG9yYSBJbnRl\ncm5hMRMwEQYDVQQLEwpUZWNub2xvZ+1hMRMwEQYDVQQKEwpTZWd1cmlEYXRhMSAw\nHgYJKoZIhvcNAQkBFhFhY0BzZWd1cmlkYXRhLmNvbTAeFw0wNzAyMTIwMDAwMDBa\nFw0xMjAyMjkwMDAwMDBaMIIBDDEWMBQGA1UELQMNAFNQUjk2MTIxN05LOTEXMBUG\nA1UEBxMOQWx2YXJvIE9icmVnb24xDTALBgNVBAgTBEQuRi4xCzAJBgNVBAYTAk1Y\nMQ4wDAYDVQQREwUwMTAwMDEoMCYGA1UECRMfSW5zdXJnZW50ZXMgU3VyIDIzNzUs\nIDNlci4gUGlzbzEbMBkGA1UEAxMSd3d3LnNlZ3VyaWRhdGEuY29tMREwDwYDVQQL\nEwhJbnRlcm5ldDEpMCcGA1UEChMgU2VndXJpRGF0YSBQcml2YWRhLCBTLkEuIGRl\nIEMuVi4xKDAmBgkqhkiG9w0BCQEWGXBvc3RtYXN0ZXJAc2VndXJpZGF0YS5jb20w\ngZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANG/rb52Ou//dnkHysR5m7T4r8QM\nKOM/CP0OEXTOC+a+47RsZjqNiZsBkSeR92OFPpkw5bJ85IAD/Tgx7Tli3ryJfrdk\nWMfkXpzWW0YmeTrghL0DMNd8n! Yc9voVv+OGnIZ0W4Mhz31eiThmyy7Fs8ZlFyfkR\nREj5OQvq+z+NP/n/AgMBAAGjODA2MBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1Ud\nDwQFAwMH6AAwEQYJYIZIAYb4QgEBBAQDAgBAMA0GCSqGSIb3DQEBBQUAA4IBAQCq\nnBqQEb7H6Gxi4KXBn1lrPd5KWO40iSD7BREU8e0eI1ZLZvi4IEAlmyG81Le037jo\nirMUDS2Ue5WI61QnGw4LhnYlCIuffU7fTs+UbrOE4qNU67G+XBfjk0gHkXHmEYbb\nEOR9OHeDcYFgcl3j4SLg/ff6oRYbMkQRCrgQzrl/MNkuqDWJrcigS9OD6OTgRyEo\n7Zvf7/ofWIzTIvINbfjQzSTr8AbI4SbuU9iKgVGDQQF6cfpBmOYgnr3QPuoTQCoU\npz9H9wBlz/Nmw12YtfCmGqpIFAxpRGFQTGPNJWr4FdZkUM792lm7Sf3zzSvi8Ruz\nM3dwifRsZyZyruy4tMsu\n-END CERTIFICATE-\n'; $cert = (binary)str_replace(\\n, \n, $certnl); $arr = openssl_x509_parse($cert); var_dump($arr['hash']); echo Done; ? --EXPECT-- string(8) 9337ed77 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_2) /ext/openssl/tests bug47828.phpt
scottmacMon Mar 30 09:18:21 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/openssl/tests bug47828.phpt Log: MFH Add test for bug #47828 http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug47828.phpt?view=markuprev=1.1 Index: php-src/ext/openssl/tests/bug47828.phpt +++ php-src/ext/openssl/tests/bug47828.phpt --TEST-- Bug #47828 (segfault with openssl_x509_parse()) --SKIPIF-- ?php if (!extension_loaded(openssl)) die(skip); ? --FILE-- ?php $certnl = '-BEGIN CERTIFICATE-\nMIIEKzCCAxOgAwIBAgICAtUwDQYJKoZIhvcNAQEFBQAwgewxFjAUBgNVBC0DDQBT\nUFI5NjEyMTdOSzkxETAPBgNVBAcTCENveW9hY+FuMQswCQYDVQQIEwJERjELMAkG\nA1UEBhMCTVgxDjAMBgNVBBETBTA0MDAwMR8wHQYDVQQJExZQYW56YWNvbGEgIzYy\nIDFlciBwaXNvMSgwJgYDVQQDEx9BdXRvcmlkYWQgY2VydGlmaWNhZG9yYSBJbnRl\ncm5hMRMwEQYDVQQLEwpUZWNub2xvZ+1hMRMwEQYDVQQKEwpTZWd1cmlEYXRhMSAw\nHgYJKoZIhvcNAQkBFhFhY0BzZWd1cmlkYXRhLmNvbTAeFw0wNzAyMTIwMDAwMDBa\nFw0xMjAyMjkwMDAwMDBaMIIBDDEWMBQGA1UELQMNAFNQUjk2MTIxN05LOTEXMBUG\nA1UEBxMOQWx2YXJvIE9icmVnb24xDTALBgNVBAgTBEQuRi4xCzAJBgNVBAYTAk1Y\nMQ4wDAYDVQQREwUwMTAwMDEoMCYGA1UECRMfSW5zdXJnZW50ZXMgU3VyIDIzNzUs\nIDNlci4gUGlzbzEbMBkGA1UEAxMSd3d3LnNlZ3VyaWRhdGEuY29tMREwDwYDVQQL\nEwhJbnRlcm5ldDEpMCcGA1UEChMgU2VndXJpRGF0YSBQcml2YWRhLCBTLkEuIGRl\nIEMuVi4xKDAmBgkqhkiG9w0BCQEWGXBvc3RtYXN0ZXJAc2VndXJpZGF0YS5jb20w\ngZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANG/rb52Ou//dnkHysR5m7T4r8QM\nKOM/CP0OEXTOC+a+47RsZjqNiZsBkSeR92OFPpkw5bJ85IAD/Tgx7Tli3ryJfrdk\nWMfkXpzWW0YmeTrghL0DMNd8n! Yc9voVv+OGnIZ0W4Mhz31eiThmyy7Fs8ZlFyfkR\nREj5OQvq+z+NP/n/AgMBAAGjODA2MBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1Ud\nDwQFAwMH6AAwEQYJYIZIAYb4QgEBBAQDAgBAMA0GCSqGSIb3DQEBBQUAA4IBAQCq\nnBqQEb7H6Gxi4KXBn1lrPd5KWO40iSD7BREU8e0eI1ZLZvi4IEAlmyG81Le037jo\nirMUDS2Ue5WI61QnGw4LhnYlCIuffU7fTs+UbrOE4qNU67G+XBfjk0gHkXHmEYbb\nEOR9OHeDcYFgcl3j4SLg/ff6oRYbMkQRCrgQzrl/MNkuqDWJrcigS9OD6OTgRyEo\n7Zvf7/ofWIzTIvINbfjQzSTr8AbI4SbuU9iKgVGDQQF6cfpBmOYgnr3QPuoTQCoU\npz9H9wBlz/Nmw12YtfCmGqpIFAxpRGFQTGPNJWr4FdZkUM792lm7Sf3zzSvi8Ruz\nM3dwifRsZyZyruy4tMsu\n-END CERTIFICATE-\n'; $cert = (binary)str_replace(\\n, \n, $certnl); $arr = openssl_x509_parse($cert); var_dump($arr['hash']); echo Done; ? --EXPECT-- string(8) 9337ed77 Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c /ext/mysqlnd mysqlnd.c mysqlnd_debug.c mysqlnd_palloc.c mysqlnd_ps_codec.c mysqlnd_result.c mysqln
Hannes Magnusson wrote: You probably mean just the mysqlnd changes, right? ext/mysql and ext/mysqli already contain bunch of differences between HEAD and 5.3. Right, the mysqlnd changes. Although I planned to unify the 5_3 and the HEAD ext/mysql and ext/mysqli to lower the maintaining costs. But let's say ext/mysql is stable it is more related to ext/mysqli, which is maturing. Best, Andrey -Hannes On Mon, Mar 30, 2009 at 09:52, Andrey Hristov p...@hristov.com wrote: Hi Felipe, backport? If no backport to PHP5_3 please revert these changes and put the appropriate blocks in #ifdef blocks (PHP_MAJOR_VERSION). Please, do it. Because the code base should not change, harder to support with two branches.Thanks! Best, Andrey Felipe Pena wrote: felipe Fri Mar 27 19:28:27 2009 UTC Modified files: /php-src/ext/mysql php_mysql.c /php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c /php-src/ext/mysqlndmysqlnd.c mysqlnd_debug.c mysqlnd_palloc.c mysqlnd_ps_codec.c mysqlnd_result.c mysqlnd_result_meta.c mysqlnd_statistics.c php_mysqlnd.c/php-src/ext/pcre php_pcre.c Log: - Removed: - UG(unicode) checks - Changed: - ZEND_STR_TYPE - IS_UNICODE - convert_to_text - convert_to_unicode -- 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 /ext/date/tests DateTimeZone_getOffset_basic1.phpt timezone_offset_get_basic1.phpt
wharmby Mon Mar 30 12:35:29 2009 UTC Modified files: /php-src/ext/date/tests timezone_offset_get_basic1.phpt DateTimeZone_getOffset_basic1.phpt Log: Fix date tests which started failing after change to BST http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/timezone_offset_get_basic1.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/date/tests/timezone_offset_get_basic1.phpt diff -u php-src/ext/date/tests/timezone_offset_get_basic1.phpt:1.2 php-src/ext/date/tests/timezone_offset_get_basic1.phpt:1.3 --- php-src/ext/date/tests/timezone_offset_get_basic1.phpt:1.2 Wed Mar 18 23:35:10 2009 +++ php-src/ext/date/tests/timezone_offset_get_basic1.phpt Mon Mar 30 12:35:29 2009 @@ -28,7 +28,7 @@ ===DONE=== --EXPECTF-- *** Testing timezone_offset_get() : basic functionality *** -int(0) +%rint\(0\)|int\(3600\)%r %rint\(-18000\)|int\(-14400\)%r %rint\(-28800\)|int\(-25200\)%r ===DONE=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt diff -u php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt:1.2 php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt:1.3 --- php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt:1.2 Wed Mar 18 11:13:01 2009 +++ php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt Mon Mar 30 12:35:29 2009 @@ -27,7 +27,7 @@ ===DONE=== --EXPECTF-- *** Testing DateTimeZone::getOffset() : basic functionality *** -int(0) +%rint\(0\)|int\(3600\)%r %rint\(-18000\)|int\(-14400\)%r %rint\(-28800\)|int\(-25200\)%r ===DONE=== \ No newline at end of file -- 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/date/tests DateTimeZone_getOffset_basic1.phpt timezone_offset_get_basic1.phpt
wharmby Mon Mar 30 12:35:30 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/date/tests timezone_offset_get_basic1.phpt DateTimeZone_getOffset_basic1.phpt Log: Fix date tests which started failing after change to BST http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/timezone_offset_get_basic1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/date/tests/timezone_offset_get_basic1.phpt diff -u php-src/ext/date/tests/timezone_offset_get_basic1.phpt:1.1.2.1 php-src/ext/date/tests/timezone_offset_get_basic1.phpt:1.1.2.2 --- php-src/ext/date/tests/timezone_offset_get_basic1.phpt:1.1.2.1 Wed Mar 18 23:34:56 2009 +++ php-src/ext/date/tests/timezone_offset_get_basic1.phpt Mon Mar 30 12:35:30 2009 @@ -28,7 +28,7 @@ ===DONE=== --EXPECTF-- *** Testing timezone_offset_get() : basic functionality *** -int(0) +%rint\(0\)|int\(3600\)%r %rint\(-18000\)|int\(-14400\)%r %rint\(-28800\)|int\(-25200\)%r ===DONE=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt diff -u php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt:1.1.2.1 php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt:1.1.2.2 --- php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt:1.1.2.1 Wed Mar 18 11:12:59 2009 +++ php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt Mon Mar 30 12:35:30 2009 @@ -27,7 +27,7 @@ ===DONE=== --EXPECTF-- *** Testing DateTimeZone::getOffset() : basic functionality *** -int(0) +%rint\(0\)|int\(3600\)%r %rint\(-18000\)|int\(-14400\)%r %rint\(-28800\)|int\(-25200\)%r ===DONE=== \ No newline at end of file -- 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 DateTimeZone_getOffset_basic1.phpt timezone_offset_get_basic1.phpt
wharmby Mon Mar 30 12:35:31 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date/tests DateTimeZone_getOffset_basic1.phpt timezone_offset_get_basic1.phpt Log: Fix date tests which started failing after change to BST http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u Index: php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt diff -u php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt:1.2.2.2 php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt:1.2.2.3 --- php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt:1.2.2.2 Wed Mar 18 11:13:03 2009 +++ php-src/ext/date/tests/DateTimeZone_getOffset_basic1.phpt Mon Mar 30 12:35:31 2009 @@ -27,7 +27,7 @@ ===DONE=== --EXPECTF-- *** Testing DateTimeZone::getOffset() : basic functionality *** -int(0) +%rint\(0\)|int\(3600\)%r %rint\(-18000\)|int\(-14400\)%r %rint\(-28800\)|int\(-25200\)%r ===DONE=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/timezone_offset_get_basic1.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u Index: php-src/ext/date/tests/timezone_offset_get_basic1.phpt diff -u php-src/ext/date/tests/timezone_offset_get_basic1.phpt:1.2.2.2 php-src/ext/date/tests/timezone_offset_get_basic1.phpt:1.2.2.3 --- php-src/ext/date/tests/timezone_offset_get_basic1.phpt:1.2.2.2 Wed Mar 18 23:35:24 2009 +++ php-src/ext/date/tests/timezone_offset_get_basic1.phpt Mon Mar 30 12:35:31 2009 @@ -28,7 +28,7 @@ ===DONE=== --EXPECTF-- *** Testing timezone_offset_get() : basic functionality *** -int(0) +%rint\(0\)|int\(3600\)%r %rint\(-18000\)|int\(-14400\)%r %rint\(-28800\)|int\(-25200\)%r ===DONE=== \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl/tests bug47828.phpt
scottmacMon Mar 30 09:17:47 2009 UTC Added files: /php-src/ext/openssl/tests bug47828.phpt Log: Add test for bug #47828 http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug47828.phpt?view=markuprev=1.1 Index: php-src/ext/openssl/tests/bug47828.phpt +++ php-src/ext/openssl/tests/bug47828.phpt --TEST-- Bug #47828 (segfault with openssl_x509_parse()) --SKIPIF-- ?php if (!extension_loaded(openssl)) die(skip); ? --FILE-- ?php $certnl = '-BEGIN CERTIFICATE-\nMIIEKzCCAxOgAwIBAgICAtUwDQYJKoZIhvcNAQEFBQAwgewxFjAUBgNVBC0DDQBT\nUFI5NjEyMTdOSzkxETAPBgNVBAcTCENveW9hY+FuMQswCQYDVQQIEwJERjELMAkG\nA1UEBhMCTVgxDjAMBgNVBBETBTA0MDAwMR8wHQYDVQQJExZQYW56YWNvbGEgIzYy\nIDFlciBwaXNvMSgwJgYDVQQDEx9BdXRvcmlkYWQgY2VydGlmaWNhZG9yYSBJbnRl\ncm5hMRMwEQYDVQQLEwpUZWNub2xvZ+1hMRMwEQYDVQQKEwpTZWd1cmlEYXRhMSAw\nHgYJKoZIhvcNAQkBFhFhY0BzZWd1cmlkYXRhLmNvbTAeFw0wNzAyMTIwMDAwMDBa\nFw0xMjAyMjkwMDAwMDBaMIIBDDEWMBQGA1UELQMNAFNQUjk2MTIxN05LOTEXMBUG\nA1UEBxMOQWx2YXJvIE9icmVnb24xDTALBgNVBAgTBEQuRi4xCzAJBgNVBAYTAk1Y\nMQ4wDAYDVQQREwUwMTAwMDEoMCYGA1UECRMfSW5zdXJnZW50ZXMgU3VyIDIzNzUs\nIDNlci4gUGlzbzEbMBkGA1UEAxMSd3d3LnNlZ3VyaWRhdGEuY29tMREwDwYDVQQL\nEwhJbnRlcm5ldDEpMCcGA1UEChMgU2VndXJpRGF0YSBQcml2YWRhLCBTLkEuIGRl\nIEMuVi4xKDAmBgkqhkiG9w0BCQEWGXBvc3RtYXN0ZXJAc2VndXJpZGF0YS5jb20w\ngZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANG/rb52Ou//dnkHysR5m7T4r8QM\nKOM/CP0OEXTOC+a+47RsZjqNiZsBkSeR92OFPpkw5bJ85IAD/Tgx7Tli3ryJfrdk\nWMfkXpzWW0YmeTrghL0DMNd8n! Yc9voVv+OGnIZ0W4Mhz31eiThmyy7Fs8ZlFyfkR\nREj5OQvq+z+NP/n/AgMBAAGjODA2MBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1Ud\nDwQFAwMH6AAwEQYJYIZIAYb4QgEBBAQDAgBAMA0GCSqGSIb3DQEBBQUAA4IBAQCq\nnBqQEb7H6Gxi4KXBn1lrPd5KWO40iSD7BREU8e0eI1ZLZvi4IEAlmyG81Le037jo\nirMUDS2Ue5WI61QnGw4LhnYlCIuffU7fTs+UbrOE4qNU67G+XBfjk0gHkXHmEYbb\nEOR9OHeDcYFgcl3j4SLg/ff6oRYbMkQRCrgQzrl/MNkuqDWJrcigS9OD6OTgRyEo\n7Zvf7/ofWIzTIvINbfjQzSTr8AbI4SbuU9iKgVGDQQF6cfpBmOYgnr3QPuoTQCoU\npz9H9wBlz/Nmw12YtfCmGqpIFAxpRGFQTGPNJWr4FdZkUM792lm7Sf3zzSvi8Ruz\nM3dwifRsZyZyruy4tMsu\n-END CERTIFICATE-\n'; $cert = (binary)str_replace(\\n, \n, $certnl); $arr = openssl_x509_parse($cert); var_dump($arr['hash']); echo Done; ? --EXPECT-- string(8) 9337ed77 Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_debug.c mysqlnd_debug.h
johannesMon Mar 30 13:53:37 2009 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd_debug.c mysqlnd_debug.h
Log:
- Fix #47819 (Getting pdo_mysql.so: undefined symbol: mysqlnd_debug_init at
startup)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_debug.c?r1=1.13r2=1.14diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_debug.c
diff -u php-src/ext/mysqlnd/mysqlnd_debug.c:1.13
php-src/ext/mysqlnd/mysqlnd_debug.c:1.14
--- php-src/ext/mysqlnd/mysqlnd_debug.c:1.13Fri Mar 27 19:28:26 2009
+++ php-src/ext/mysqlnd/mysqlnd_debug.c Mon Mar 30 13:53:35 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_debug.c,v 1.13 2009/03/27 19:28:26 felipe Exp $ */
+/* $Id: mysqlnd_debug.c,v 1.14 2009/03/30 13:53:35 johannes Exp $ */
#include php.h
#include mysqlnd.h
@@ -618,7 +618,7 @@
/* {{{ mysqlnd_debug_init */
-MYSQLND_DEBUG *mysqlnd_debug_init(TSRMLS_D)
+PHPAPI MYSQLND_DEBUG *mysqlnd_debug_init(TSRMLS_D)
{
MYSQLND_DEBUG *ret = ecalloc(1, sizeof(MYSQLND_DEBUG));
#ifdef ZTS
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_debug.h?r1=1.11r2=1.12diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_debug.h
diff -u php-src/ext/mysqlnd/mysqlnd_debug.h:1.11
php-src/ext/mysqlnd/mysqlnd_debug.h:1.12
--- php-src/ext/mysqlnd/mysqlnd_debug.h:1.11Wed Dec 31 11:12:33 2008
+++ php-src/ext/mysqlnd/mysqlnd_debug.h Mon Mar 30 13:53:35 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_debug.h,v 1.11 2008/12/31 11:12:33 sebastian Exp $ */
+/* $Id: mysqlnd_debug.h,v 1.12 2009/03/30 13:53:35 johannes Exp $ */
#ifndef MYSQLND_DEBUG_H
#define MYSQLND_DEBUG_H
@@ -58,7 +58,7 @@
};
-MYSQLND_DEBUG *mysqlnd_debug_init(TSRMLS_D);
+PHPAPI MYSQLND_DEBUG *mysqlnd_debug_init(TSRMLS_D);
#define MYSQLND_MEM_D TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC
--
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/mysqlnd mysqlnd_debug.c mysqlnd_debug.h
johannesMon Mar 30 13:55:48 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/php-src/ext/mysqlndmysqlnd_debug.c mysqlnd_debug.h
Log:
MFH Fix #47819 (Getting pdo_mysql.so: undefined symbol: mysqlnd_debug_init at
startup)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.543r2=1.2027.2.547.2.965.2.544diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.543
php-src/NEWS:1.2027.2.547.2.965.2.544
--- php-src/NEWS:1.2027.2.547.2.965.2.543 Sat Mar 28 03:21:04 2009
+++ php-src/NEWSMon Mar 30 13:55:47 2009
@@ -3,6 +3,8 @@
?? ??? 200?, PHP 5.3.0 RC 2
- Undeprecated ticks. (Arnaud)
+- Fixed bug #47819 (Getting pdo_mysql.so: undefined symbol: mysqlnd_debug_init
+ at startup). (Johannes)
- Fixed bug #47816 (pcntl tests failing on NetBSD). (Matteo)
- Fixed bug #44861 (scrollable cursor don't work with pgsql). (Matteo)
- Fixed bug #47779 (Wrong value for SIG_UNBLOCK and SIG_SETMASK constants).
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_debug.c?r1=1.1.2.13r2=1.1.2.14diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_debug.c
diff -u php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.13
php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.14
--- php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.13Wed Dec 31 11:15:39 2008
+++ php-src/ext/mysqlnd/mysqlnd_debug.c Mon Mar 30 13:55:47 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_debug.c,v 1.1.2.13 2008/12/31 11:15:39 sebastian Exp $ */
+/* $Id: mysqlnd_debug.c,v 1.1.2.14 2009/03/30 13:55:47 johannes Exp $ */
#include php.h
#include mysqlnd.h
@@ -618,7 +618,7 @@
/* {{{ mysqlnd_debug_init */
-MYSQLND_DEBUG *mysqlnd_debug_init(TSRMLS_D)
+PHPAPI MYSQLND_DEBUG *mysqlnd_debug_init(TSRMLS_D)
{
MYSQLND_DEBUG *ret = ecalloc(1, sizeof(MYSQLND_DEBUG));
#ifdef ZTS
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_debug.h?r1=1.1.2.11r2=1.1.2.12diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_debug.h
diff -u php-src/ext/mysqlnd/mysqlnd_debug.h:1.1.2.11
php-src/ext/mysqlnd/mysqlnd_debug.h:1.1.2.12
--- php-src/ext/mysqlnd/mysqlnd_debug.h:1.1.2.11Wed Dec 31 11:15:39 2008
+++ php-src/ext/mysqlnd/mysqlnd_debug.h Mon Mar 30 13:55:47 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_debug.h,v 1.1.2.11 2008/12/31 11:15:39 sebastian Exp $ */
+/* $Id: mysqlnd_debug.h,v 1.1.2.12 2009/03/30 13:55:47 johannes Exp $ */
#ifndef MYSQLND_DEBUG_H
#define MYSQLND_DEBUG_H
@@ -58,7 +58,7 @@
};
-MYSQLND_DEBUG *mysqlnd_debug_init(TSRMLS_D);
+PHPAPI MYSQLND_DEBUG *mysqlnd_debug_init(TSRMLS_D);
#define MYSQLND_MEM_D TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC
--
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/isapi php5isapi.c
kalle Mon Mar 30 14:24:16 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/isapi php5isapi.c
Log:
MFH: Fixed compiler warning
http://cvs.php.net/viewvc.cgi/php-src/sapi/isapi/php5isapi.c?r1=1.8.2.2.2.3.2.4r2=1.8.2.2.2.3.2.5diff_format=u
Index: php-src/sapi/isapi/php5isapi.c
diff -u php-src/sapi/isapi/php5isapi.c:1.8.2.2.2.3.2.4
php-src/sapi/isapi/php5isapi.c:1.8.2.2.2.3.2.5
--- php-src/sapi/isapi/php5isapi.c:1.8.2.2.2.3.2.4 Wed Dec 31 11:15:49 2008
+++ php-src/sapi/isapi/php5isapi.c Mon Mar 30 14:24:16 2009
@@ -16,7 +16,7 @@
| Ben Mansell b...@zeus.com (Zeus Support) |
+--+
*/
-/* $Id: php5isapi.c,v 1.8.2.2.2.3.2.4 2008/12/31 11:15:49 sebastian Exp $ */
+/* $Id: php5isapi.c,v 1.8.2.2.2.3.2.5 2009/03/30 14:24:16 kalle Exp $ */
#include php.h
#include httpext.h
@@ -215,7 +215,7 @@
}
-static int sapi_isapi_header_handler(sapi_header_struct *sapi_header,
sapi_headers_struct *sapi_headers TSRMLS_DC)
+static int sapi_isapi_header_handler(sapi_header_struct *sapi_header,
sapi_header_op_enum op, sapi_headers_struct *sapi_headers TSRMLS_DC)
{
return SAPI_HEADER_ADD;
}
--
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/odbc php_odbc.c
kalle Mon Mar 30 14:25:54 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/odbc php_odbc.c
Log:
Nuke unused variable (only in this branch)
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.7.2.17r2=1.189.2.4.2.7.2.18diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.17
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.18
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.7.2.17 Tue Mar 24 09:44:16 2009
+++ php-src/ext/odbc/php_odbc.c Mon Mar 30 14:25:54 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.17 2009/03/24 09:44:16 pajoye Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.7.2.18 2009/03/30 14:25:54 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -3367,7 +3367,6 @@
char *cat = NULL, *schema = NULL, *table = NULL;
int cat_len, schema_len, table_len;
RETCODE rc;
- int argc;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rsss, pv_conn,
cat, cat_len, schema, schema_len, table, table_len) == FAILURE) {
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build Makefile mkdist.php
kalle Mon Mar 30 14:32:20 2009 UTC
Modified files:
/php-src/win32/buildMakefile mkdist.php
Log:
* Bypass the date/timezone warning by forcing UTC when running mkdist.php
* Don't run the copy list for PECL if theres no PECL extensions to copy
(fixes a few copy() warnings)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.52r2=1.53diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.52 php-src/win32/build/Makefile:1.53
--- php-src/win32/build/Makefile:1.52 Fri Nov 21 14:05:04 2008
+++ php-src/win32/build/MakefileMon Mar 30 14:32:20 2009
@@ -14,7 +14,7 @@
# | Author: Wez Furlong w...@thebrainroom.com |
# +--+
#
-# $Id: Makefile,v 1.52 2008/11/21 14:05:04 pajoye Exp $
+# $Id: Makefile,v 1.53 2009/03/30 14:32:20 kalle Exp $
# This is the makefile template for the win32 build
CC=$(CL)
@@ -131,7 +131,7 @@
-del /f /q
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
- $(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR)
$(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)
$(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES) $(SNAPSHOT_TEMPLATE)
+ $(BUILD_DIR)\php.exe -d date.timezone=UTC -n win32/build/mkdist.php
$(BUILD_DIR) $(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS)
$(PHP_EXTRA_DIST_FILES) $(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES)
$(SNAPSHOT_TEMPLATE)
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -q -r
..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
.
cd ..\..
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.21r2=1.22diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.21 php-src/win32/build/mkdist.php:1.22
--- php-src/win32/build/mkdist.php:1.21 Tue Mar 24 22:16:57 2009
+++ php-src/win32/build/mkdist.php Mon Mar 30 14:32:20 2009
@@ -1,4 +1,4 @@
-?php # $Id: mkdist.php,v 1.21 2009/03/24 22:16:57 pajoye Exp $
+?php # $Id: mkdist.php,v 1.22 2009/03/30 14:32:20 kalle Exp $
/* piece together a windows binary distro */
$build_dir = $argv[1];
@@ -214,7 +214,9 @@
copy_file_list($build_dir, $dist_dir/ext, $ext_targets);
/* pecl sapi and extensions */
-copy_file_list($build_dir, $pecl_dir, $pecl_targets);
+if(sizeof($pecl_targets)) {
+ copy_file_list($build_dir, $pecl_dir, $pecl_targets);
+}
/* populate reading material */
$text_files = array(
--
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/build Makefile mkdist.php
kalle Mon Mar 30 14:32:52 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/buildMakefile mkdist.php
Log:
MFH:
* Bypass the date/timezone warning by forcing UTC when running mkdist.php
* Don't run the copy list for PECL if theres no PECL extensions to copy
(fixes a few copy() warnings)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.6.2.10r2=1.35.2.1.2.6.2.11diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.6.2.10
php-src/win32/build/Makefile:1.35.2.1.2.6.2.11
--- php-src/win32/build/Makefile:1.35.2.1.2.6.2.10 Fri Nov 21 14:18:27 2008
+++ php-src/win32/build/MakefileMon Mar 30 14:32:52 2009
@@ -14,7 +14,7 @@
# | Author: Wez Furlong w...@thebrainroom.com |
# +--+
#
-# $Id: Makefile,v 1.35.2.1.2.6.2.10 2008/11/21 14:18:27 pajoye Exp $
+# $Id: Makefile,v 1.35.2.1.2.6.2.11 2009/03/30 14:32:52 kalle Exp $
# This is the makefile template for the win32 build
CC=$(CL)
@@ -131,7 +131,7 @@
-del /f /q
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-del /f /q
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
- $(BUILD_DIR)\php.exe -n win32/build/mkdist.php $(BUILD_DIR)
$(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS) $(PHP_EXTRA_DIST_FILES)
$(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES) $(SNAPSHOT_TEMPLATE)
+ $(BUILD_DIR)\php.exe -d date.timezone=UTC -n win32/build/mkdist.php
$(BUILD_DIR) $(PHPDLL) $(SAPI_TARGETS) $(EXT_TARGETS)
$(PHP_EXTRA_DIST_FILES) $(PECL_TARGETS) $(PECL_EXTRA_DIST_FILES)
$(SNAPSHOT_TEMPLATE)
cd $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
-$(ZIP) -9 -q -r
..\php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
.
cd ..\..
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.13.4.1.2.8r2=1.13.4.1.2.9diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.13.4.1.2.8
php-src/win32/build/mkdist.php:1.13.4.1.2.9
--- php-src/win32/build/mkdist.php:1.13.4.1.2.8 Tue Mar 24 22:15:46 2009
+++ php-src/win32/build/mkdist.php Mon Mar 30 14:32:52 2009
@@ -1,4 +1,4 @@
-?php # $Id: mkdist.php,v 1.13.4.1.2.8 2009/03/24 22:15:46 pajoye Exp $
+?php # $Id: mkdist.php,v 1.13.4.1.2.9 2009/03/30 14:32:52 kalle Exp $
/* piece together a windows binary distro */
$build_dir = $argv[1];
@@ -214,7 +214,9 @@
copy_file_list($build_dir, $dist_dir/ext, $ext_targets);
/* pecl sapi and extensions */
-copy_file_list($build_dir, $pecl_dir, $pecl_targets);
+if(sizeof($pecl_targets)) {
+ copy_file_list($build_dir, $pecl_dir, $pecl_targets);
+}
/* populate reading material */
$text_files = array(
--
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/mysqlnd mysqlnd.c mysqlnd_debug.c mysqlnd_palloc.c mysqlnd_ps_codec.c mysqlnd_result.c mysqlnd_result_meta.c mysqlnd_statistics.c php_mysqlnd.c
felipe Mon Mar 30 16:52:33 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd.c mysqlnd_debug.c mysqlnd_palloc.c
mysqlnd_ps_codec.c mysqlnd_result.c
mysqlnd_result_meta.c mysqlnd_statistics.c
php_mysqlnd.c
Log:
- MFH: Removed UG(unicode) checks
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.37r2=1.5.2.38diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.37
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.38
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.37 Mon Feb 16 17:26:43 2009
+++ php-src/ext/mysqlnd/mysqlnd.c Mon Mar 30 16:52:33 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd.c,v 1.5.2.37 2009/02/16 17:26:43 johannes Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.38 2009/03/30 16:52:33 felipe Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_wireprotocol.h
@@ -663,12 +663,12 @@
(charset =
mysqlnd_find_charset_name(conn-options.charset_name)))
{
auth_packet-charset_no = charset-nr;
+ } else {
#if PHP_MAJOR_VERSION = 6
- } else if (UG(unicode)) {
auth_packet-charset_no = 200;/* utf8 - swedish collation,
check mysqlnd_charset.c */
-#endif
- } else {
+#else
auth_packet-charset_no = greet_packet.charset_no;
+#endif
}
auth_packet-db = db;
auth_packet-db_len = db_len;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_debug.c?r1=1.1.2.14r2=1.1.2.15diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_debug.c
diff -u php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.14
php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.15
--- php-src/ext/mysqlnd/mysqlnd_debug.c:1.1.2.14Mon Mar 30 13:55:47 2009
+++ php-src/ext/mysqlnd/mysqlnd_debug.c Mon Mar 30 16:52:33 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_debug.c,v 1.1.2.14 2009/03/30 13:55:47 johannes Exp $ */
+/* $Id: mysqlnd_debug.c,v 1.1.2.15 2009/03/30 16:52:33 felipe Exp $ */
#include php.h
#include mysqlnd.h
@@ -1107,6 +1107,7 @@
TRACE_APPEND_STR(Array, );
break;
case IS_OBJECT: {
+ zval tmp;
zstr class_name;
zend_uint class_name_len;
int dup;
@@ -1115,16 +1116,11 @@
dup = zend_get_object_classname(*arg, class_name,
class_name_len TSRMLS_CC);
- if (UG(unicode)) {
- zval tmp;
+ ZVAL_UNICODEL(tmp, class_name.u, class_name_len, 1);
+ convert_to_string_with_converter(tmp,
ZEND_U_CONVERTER(UG(output_encoding_conv)));
+ TRACE_APPEND_STRL(Z_STRVAL(tmp), Z_STRLEN(tmp));
+ zval_dtor(tmp);
- ZVAL_UNICODEL(tmp, class_name.u,
class_name_len, 1);
- convert_to_string_with_converter(tmp,
ZEND_U_CONVERTER(UG(output_encoding_conv)));
- TRACE_APPEND_STRL(Z_STRVAL(tmp), Z_STRLEN(tmp));
- zval_dtor(tmp);
- } else {
- TRACE_APPEND_STRL(class_name.s, class_name_len);
- }
if(!dup) {
efree(class_name.v);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_palloc.c?r1=1.2.2.14r2=1.2.2.15diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_palloc.c
diff -u php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.14
php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.15
--- php-src/ext/mysqlnd/mysqlnd_palloc.c:1.2.2.14 Wed Dec 31 11:15:39 2008
+++ php-src/ext/mysqlnd/mysqlnd_palloc.cMon Mar 30 16:52:33 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_palloc.c,v 1.2.2.14 2008/12/31 11:15:39 sebastian Exp $ */
+/* $Id: mysqlnd_palloc.c,v 1.2.2.15 2009/03/30 16:52:33 felipe Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_priv.h
@@ -39,13 +39,6 @@
#endif
-#if PHP_MAJOR_VERSION 6
-#define IS_UNICODE_DISABLED (1)
-#else
-#define IS_UNICODE_DISABLED (!UG(unicode))
-#endif
-
-
/* {{{ _mysqlnd_palloc_init_cache */
PHPAPI MYSQLND_ZVAL_PCACHE* _mysqlnd_palloc_init_cache(unsigned int cache_size
TSRMLS_DC)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_ps_codec.c?r1=1.3.2.14r2=1.3.2.15diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_ps_codec.c
diff -u php-src/ext/mysqlnd/mysqlnd_ps_codec.c:1.3.2.14
php-src/ext/mysqlnd/mysqlnd_ps_codec.c:1.3.2.15
---
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/openssl/tests bug47828.phpt
pajoye Mon Mar 30 18:05:17 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/openssl/tests bug47828.phpt Log: - better test case, it crashes on more architecture http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug47828.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/openssl/tests/bug47828.phpt diff -u php-src/ext/openssl/tests/bug47828.phpt:1.1.4.2 php-src/ext/openssl/tests/bug47828.phpt:1.1.4.3 --- php-src/ext/openssl/tests/bug47828.phpt:1.1.4.2 Mon Mar 30 09:18:21 2009 +++ php-src/ext/openssl/tests/bug47828.phpt Mon Mar 30 18:05:17 2009 @@ -1,11 +1,36 @@ --TEST-- -Bug #47828 (segfault with openssl_x509_parse()) +Bug #47828 (segfaults when a UTF-8 conversion fails openssl_x509_parse()) --SKIPIF-- ?php if (!extension_loaded(openssl)) die(skip); ? --FILE-- ?php -$certnl = '-BEGIN CERTIFICATE-\nMIIEKzCCAxOgAwIBAgICAtUwDQYJKoZIhvcNAQEFBQAwgewxFjAUBgNVBC0DDQBT\nUFI5NjEyMTdOSzkxETAPBgNVBAcTCENveW9hY+FuMQswCQYDVQQIEwJERjELMAkG\nA1UEBhMCTVgxDjAMBgNVBBETBTA0MDAwMR8wHQYDVQQJExZQYW56YWNvbGEgIzYy\nIDFlciBwaXNvMSgwJgYDVQQDEx9BdXRvcmlkYWQgY2VydGlmaWNhZG9yYSBJbnRl\ncm5hMRMwEQYDVQQLEwpUZWNub2xvZ+1hMRMwEQYDVQQKEwpTZWd1cmlEYXRhMSAw\nHgYJKoZIhvcNAQkBFhFhY0BzZWd1cmlkYXRhLmNvbTAeFw0wNzAyMTIwMDAwMDBa\nFw0xMjAyMjkwMDAwMDBaMIIBDDEWMBQGA1UELQMNAFNQUjk2MTIxN05LOTEXMBUG\nA1UEBxMOQWx2YXJvIE9icmVnb24xDTALBgNVBAgTBEQuRi4xCzAJBgNVBAYTAk1Y\nMQ4wDAYDVQQREwUwMTAwMDEoMCYGA1UECRMfSW5zdXJnZW50ZXMgU3VyIDIzNzUs\nIDNlci4gUGlzbzEbMBkGA1UEAxMSd3d3LnNlZ3VyaWRhdGEuY29tMREwDwYDVQQL\nEwhJbnRlcm5ldDEpMCcGA1UEChMgU2VndXJpRGF0YSBQcml2YWRhLCBTLkEuIGRl\nIEMuVi4xKDAmBgkqhkiG9w0BCQEWGXBvc3RtYXN0ZXJAc2VndXJpZGF0YS5jb20w\ngZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANG/rb52Ou//dnkHysR5m7T4r8QM\nKOM/CP0OEXTOC+a+47RsZjqNiZsBkSeR92OFPpkw5bJ85IAD/Tgx7Tli3ryJfrdk\nWMfkXpzWW0YmeTrghL0DMNd8! nYc9voVv+OGnIZ0W4Mhz31eiThmyy7Fs8ZlFyfkR\nREj5OQvq+z+NP/n/AgMBAAGjODA2MBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1Ud\nDwQFAwMH6AAwEQYJYIZIAYb4QgEBBAQDAgBAMA0GCSqGSIb3DQEBBQUAA4IBAQCq\nnBqQEb7H6Gxi4KXBn1lrPd5KWO40iSD7BREU8e0eI1ZLZvi4IEAlmyG81Le037jo\nirMUDS2Ue5WI61QnGw4LhnYlCIuffU7fTs+UbrOE4qNU67G+XBfjk0gHkXHmEYbb\nEOR9OHeDcYFgcl3j4SLg/ff6oRYbMkQRCrgQzrl/MNkuqDWJrcigS9OD6OTgRyEo\n7Zvf7/ofWIzTIvINbfjQzSTr8AbI4SbuU9iKgVGDQQF6cfpBmOYgnr3QPuoTQCoU\npz9H9wBlz/Nmw12YtfCmGqpIFAxpRGFQTGPNJWr4FdZkUM792lm7Sf3zzSvi8Ruz\nM3dwifRsZyZyruy4tMsu\n-END CERTIFICATE-\n'; -$cert = str_replace(\\n, \n, $certnl); +$csr = -BEGIN CERTIFICATE- +MIIEKzCCAxOgAwIBAgICAtUwDQYJKoZIhvcNAQEFBQAwgewxFjAUBgNVBC0DDQBT +UFI5NjEyMTdOSzkxETAPBgNVBAcTCENveW9hY+FuMQswCQYDVQQIEwJERjELMAkG +A1UEBhMCTVgxDjAMBgNVBBETBTA0MDAwMR8wHQYDVQQJExZQYW56YWNvbGEgIzYy +IDFlciBwaXNvMSgwJgYDVQQDEx9BdXRvcmlkYWQgY2VydGlmaWNhZG9yYSBJbnRl +cm5hMRMwEQYDVQQLEwpUZWNub2xvZ+1hMRMwEQYDVQQKEwpTZWd1cmlEYXRhMSAw +HgYJKoZIhvcNAQkBFhFhY0BzZWd1cmlkYXRhLmNvbTAeFw0wNzAyMTIwMDAwMDBa +Fw0xMjAyMjkwMDAwMDBaMIIBDDEWMBQGA1UELQMNAFNQUjk2MTIxN05LOTEXMBUG +A1UEBxMOQWx2YXJvIE9icmVnb24xDTALBgNVBAgTBEQuRi4xCzAJBgNVBAYTAk1Y +MQ4wDAYDVQQREwUwMTAwMDEoMCYGA1UECRMfSW5zdXJnZW50ZXMgU3VyIDIzNzUs +IDNlci4gUGlzbzEbMBkGA1UEAxMSd3d3LnNlZ3VyaWRhdGEuY29tMREwDwYDVQQL +EwhJbnRlcm5ldDEpMCcGA1UEChMgU2VndXJpRGF0YSBQcml2YWRhLCBTLkEuIGRl +IEMuVi4xKDAmBgkqhkiG9w0BCQEWGXBvc3RtYXN0ZXJAc2VndXJpZGF0YS5jb20w +gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANG/rb52Ou//dnkHysR5m7T4r8QM +KOM/CP0OEXTOC+a+47RsZjqNiZsBkSeR92OFPpkw5bJ85IAD/Tgx7Tli3ryJfrdk +WMfkXpzWW0YmeTrghL0DMNd8nYc9voVv+OGnIZ0W4Mhz31eiThmyy7Fs8ZlFyfkR +REj5OQvq+z+NP/n/AgMBAAGjODA2MBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1Ud +DwQFAwMH6AAwEQYJYIZIAYb4QgEBBAQDAgBAMA0GCSqGSIb3DQEBBQUAA4IBAQCq +nBqQEb7H6Gxi4KXBn1lrPd5KWO40iSD7BREU8e0eI1ZLZvi4IEAlmyG81Le037jo +irMUDS2Ue5WI61QnGw4LhnYlCIuffU7fTs+UbrOE4qNU67G+XBfjk0gHkXHmEYbb +EOR9OHeDcYFgcl3j4SLg/ff6oRYbMkQRCrgQzrl/MNkuqDWJrcigS9OD6OTgRyEo +7Zvf7/ofWIzTIvINbfjQzSTr8AbI4SbuU9iKgVGDQQF6cfpBmOYgnr3QPuoTQCoU +pz9H9wBlz/Nmw12YtfCmGqpIFAxpRGFQTGPNJWr4FdZkUM792lm7Sf3zzSvi8Ruz +M3dwifRsZyZyruy4tMsu +-END CERTIFICATE- +; +$cert = str_replace(\\n, \n, $csr); $arr = openssl_x509_parse($cert); var_dump($arr['hash']); echo 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_2) / NEWS
pajoye Mon Mar 30 18:05:43 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - #47828 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1452r2=1.2027.2.547.2.1453diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1452 php-src/NEWS:1.2027.2.547.2.1453 --- php-src/NEWS:1.2027.2.547.2.1452Sun Mar 29 23:35:58 2009 +++ php-src/NEWSMon Mar 30 18:05:42 2009 @@ -8,7 +8,7 @@ - Fixed memory leak in ob_get_clean/ob_get_flush. (Christian) - Fixed bug #47828 (openssl_x509_parse() segfaults when a UTF-8 conversion - fails). (Scott) + fails). (Scott, Kees Cook, Pierre) - Fixed bug #47769 (Strange extends PDO). (Felipe) - Fixed bug #47721 (Alignment issues in mbstring and sysvshm extension) (crrodriguez at opensuse dot org, Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl/tests bug47828.phpt
pajoye Mon Mar 30 18:06:22 2009 UTC Modified files: /php-src/ext/openssl/tests bug47828.phpt Log: - MFB: better test case, it crashes on more architecture http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug47828.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/openssl/tests/bug47828.phpt diff -u php-src/ext/openssl/tests/bug47828.phpt:1.1 php-src/ext/openssl/tests/bug47828.phpt:1.2 --- php-src/ext/openssl/tests/bug47828.phpt:1.1 Mon Mar 30 09:17:47 2009 +++ php-src/ext/openssl/tests/bug47828.phpt Mon Mar 30 18:06:22 2009 @@ -1,11 +1,36 @@ --TEST-- -Bug #47828 (segfault with openssl_x509_parse()) +Bug #47828 (segfaults when a UTF-8 conversion fails openssl_x509_parse()) --SKIPIF-- ?php if (!extension_loaded(openssl)) die(skip); ? --FILE-- ?php -$certnl = '-BEGIN CERTIFICATE-\nMIIEKzCCAxOgAwIBAgICAtUwDQYJKoZIhvcNAQEFBQAwgewxFjAUBgNVBC0DDQBT\nUFI5NjEyMTdOSzkxETAPBgNVBAcTCENveW9hY+FuMQswCQYDVQQIEwJERjELMAkG\nA1UEBhMCTVgxDjAMBgNVBBETBTA0MDAwMR8wHQYDVQQJExZQYW56YWNvbGEgIzYy\nIDFlciBwaXNvMSgwJgYDVQQDEx9BdXRvcmlkYWQgY2VydGlmaWNhZG9yYSBJbnRl\ncm5hMRMwEQYDVQQLEwpUZWNub2xvZ+1hMRMwEQYDVQQKEwpTZWd1cmlEYXRhMSAw\nHgYJKoZIhvcNAQkBFhFhY0BzZWd1cmlkYXRhLmNvbTAeFw0wNzAyMTIwMDAwMDBa\nFw0xMjAyMjkwMDAwMDBaMIIBDDEWMBQGA1UELQMNAFNQUjk2MTIxN05LOTEXMBUG\nA1UEBxMOQWx2YXJvIE9icmVnb24xDTALBgNVBAgTBEQuRi4xCzAJBgNVBAYTAk1Y\nMQ4wDAYDVQQREwUwMTAwMDEoMCYGA1UECRMfSW5zdXJnZW50ZXMgU3VyIDIzNzUs\nIDNlci4gUGlzbzEbMBkGA1UEAxMSd3d3LnNlZ3VyaWRhdGEuY29tMREwDwYDVQQL\nEwhJbnRlcm5ldDEpMCcGA1UEChMgU2VndXJpRGF0YSBQcml2YWRhLCBTLkEuIGRl\nIEMuVi4xKDAmBgkqhkiG9w0BCQEWGXBvc3RtYXN0ZXJAc2VndXJpZGF0YS5jb20w\ngZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANG/rb52Ou//dnkHysR5m7T4r8QM\nKOM/CP0OEXTOC+a+47RsZjqNiZsBkSeR92OFPpkw5bJ85IAD/Tgx7Tli3ryJfrdk\nWMfkXpzWW0YmeTrghL0DMNd8! nYc9voVv+OGnIZ0W4Mhz31eiThmyy7Fs8ZlFyfkR\nREj5OQvq+z+NP/n/AgMBAAGjODA2MBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1Ud\nDwQFAwMH6AAwEQYJYIZIAYb4QgEBBAQDAgBAMA0GCSqGSIb3DQEBBQUAA4IBAQCq\nnBqQEb7H6Gxi4KXBn1lrPd5KWO40iSD7BREU8e0eI1ZLZvi4IEAlmyG81Le037jo\nirMUDS2Ue5WI61QnGw4LhnYlCIuffU7fTs+UbrOE4qNU67G+XBfjk0gHkXHmEYbb\nEOR9OHeDcYFgcl3j4SLg/ff6oRYbMkQRCrgQzrl/MNkuqDWJrcigS9OD6OTgRyEo\n7Zvf7/ofWIzTIvINbfjQzSTr8AbI4SbuU9iKgVGDQQF6cfpBmOYgnr3QPuoTQCoU\npz9H9wBlz/Nmw12YtfCmGqpIFAxpRGFQTGPNJWr4FdZkUM792lm7Sf3zzSvi8Ruz\nM3dwifRsZyZyruy4tMsu\n-END CERTIFICATE-\n'; -$cert = (binary)str_replace(\\n, \n, $certnl); +$csr = -BEGIN CERTIFICATE- +MIIEKzCCAxOgAwIBAgICAtUwDQYJKoZIhvcNAQEFBQAwgewxFjAUBgNVBC0DDQBT +UFI5NjEyMTdOSzkxETAPBgNVBAcTCENveW9hY+FuMQswCQYDVQQIEwJERjELMAkG +A1UEBhMCTVgxDjAMBgNVBBETBTA0MDAwMR8wHQYDVQQJExZQYW56YWNvbGEgIzYy +IDFlciBwaXNvMSgwJgYDVQQDEx9BdXRvcmlkYWQgY2VydGlmaWNhZG9yYSBJbnRl +cm5hMRMwEQYDVQQLEwpUZWNub2xvZ+1hMRMwEQYDVQQKEwpTZWd1cmlEYXRhMSAw +HgYJKoZIhvcNAQkBFhFhY0BzZWd1cmlkYXRhLmNvbTAeFw0wNzAyMTIwMDAwMDBa +Fw0xMjAyMjkwMDAwMDBaMIIBDDEWMBQGA1UELQMNAFNQUjk2MTIxN05LOTEXMBUG +A1UEBxMOQWx2YXJvIE9icmVnb24xDTALBgNVBAgTBEQuRi4xCzAJBgNVBAYTAk1Y +MQ4wDAYDVQQREwUwMTAwMDEoMCYGA1UECRMfSW5zdXJnZW50ZXMgU3VyIDIzNzUs +IDNlci4gUGlzbzEbMBkGA1UEAxMSd3d3LnNlZ3VyaWRhdGEuY29tMREwDwYDVQQL +EwhJbnRlcm5ldDEpMCcGA1UEChMgU2VndXJpRGF0YSBQcml2YWRhLCBTLkEuIGRl +IEMuVi4xKDAmBgkqhkiG9w0BCQEWGXBvc3RtYXN0ZXJAc2VndXJpZGF0YS5jb20w +gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANG/rb52Ou//dnkHysR5m7T4r8QM +KOM/CP0OEXTOC+a+47RsZjqNiZsBkSeR92OFPpkw5bJ85IAD/Tgx7Tli3ryJfrdk +WMfkXpzWW0YmeTrghL0DMNd8nYc9voVv+OGnIZ0W4Mhz31eiThmyy7Fs8ZlFyfkR +REj5OQvq+z+NP/n/AgMBAAGjODA2MBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1Ud +DwQFAwMH6AAwEQYJYIZIAYb4QgEBBAQDAgBAMA0GCSqGSIb3DQEBBQUAA4IBAQCq +nBqQEb7H6Gxi4KXBn1lrPd5KWO40iSD7BREU8e0eI1ZLZvi4IEAlmyG81Le037jo +irMUDS2Ue5WI61QnGw4LhnYlCIuffU7fTs+UbrOE4qNU67G+XBfjk0gHkXHmEYbb +EOR9OHeDcYFgcl3j4SLg/ff6oRYbMkQRCrgQzrl/MNkuqDWJrcigS9OD6OTgRyEo +7Zvf7/ofWIzTIvINbfjQzSTr8AbI4SbuU9iKgVGDQQF6cfpBmOYgnr3QPuoTQCoU +pz9H9wBlz/Nmw12YtfCmGqpIFAxpRGFQTGPNJWr4FdZkUM792lm7Sf3zzSvi8Ruz +M3dwifRsZyZyruy4tMsu +-END CERTIFICATE- +; +$cert = str_replace(\\n, \n, $csr); $arr = openssl_x509_parse($cert); var_dump($arr['hash']); echo 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) / EXTENSIONS
iliaa Mon Mar 30 19:49:04 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcEXTENSIONS Log: Changed order by Wez's request http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.72.2.4.2.4.2.14r2=1.72.2.4.2.4.2.15diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.72.2.4.2.4.2.14 php-src/EXTENSIONS:1.72.2.4.2.4.2.15 --- php-src/EXTENSIONS:1.72.2.4.2.4.2.14Tue Mar 24 23:57:30 2009 +++ php-src/EXTENSIONS Mon Mar 30 19:49:04 2009 @@ -169,7 +169,7 @@ COMMENT: Working --- EXTENSION: pdo -PRIMARY MAINTAINER: Wez Furlong w...@php.net, Ilia Alshanetsky il...@php.net +PRIMARY MAINTAINER: Ilia Alshanetsky il...@php.net, Wez Furlong w...@php.net MAINTENANCE: Odd fixes STATUS: Working SINCE: 5.1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c /ext/mysqlnd mysqlnd.c mysqlnd_debug.c mysqlnd_palloc.c mysqlnd_ps_codec.c mysqlnd_result.c mysqln
Hi Andrey, Em Seg, 2009-03-30 às 09:52 +0200, Andrey Hristov escreveu: Hi Felipe, backport? If no backport to PHP5_3 please revert these changes and put the appropriate blocks in #ifdef blocks (PHP_MAJOR_VERSION). Please, do it. Because the code base should not change, harder to support with two branches.Thanks! I've backported the changes. Thanks. Best, Andrey Felipe Pena wrote: felipe Fri Mar 27 19:28:27 2009 UTC Modified files: /php-src/ext/mysql php_mysql.c /php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c /php-src/ext/mysqlndmysqlnd.c mysqlnd_debug.c mysqlnd_palloc.c mysqlnd_ps_codec.c mysqlnd_result.c mysqlnd_result_meta.c mysqlnd_statistics.c php_mysqlnd.c /php-src/ext/pcre php_pcre.c Log: - Removed: - UG(unicode) checks - Changed: - ZEND_STR_TYPE - IS_UNICODE - convert_to_text - convert_to_unicode -- Regards, Felipe Pena -- 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 /main spprintf.c
iliaa Mon Mar 30 19:59:08 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/main spprintf.c /php-srcNEWS Log: Fixed bug #47831 (Compile warning for strnlen() in main/spprintf.c) # Patch by rainer\ dot\ jung\ at\ kippdata\ dot\ de http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.25.2.2.2.15r2=1.25.2.2.2.16diff_format=u Index: php-src/main/spprintf.c diff -u php-src/main/spprintf.c:1.25.2.2.2.15 php-src/main/spprintf.c:1.25.2.2.2.16 --- php-src/main/spprintf.c:1.25.2.2.2.15 Wed Feb 4 15:03:12 2009 +++ php-src/main/spprintf.c Mon Mar 30 19:59:07 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spprintf.c,v 1.25.2.2.2.15 2009/02/04 15:03:12 iliaa Exp $ */ +/* $Id: spprintf.c,v 1.25.2.2.2.16 2009/03/30 19:59:07 iliaa Exp $ */ /* This is the spprintf implementation. * It has emerged from apache snprintf. See original header: @@ -76,6 +76,7 @@ * SIO stdio-replacement strx_* functions by Panos Tsirigotis * pa...@alumni.cs.colorado.edu for xinetd. */ +#define _GNU_SOURCE #include php.h #include stddef.h http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1453r2=1.2027.2.547.2.1454diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1453 php-src/NEWS:1.2027.2.547.2.1454 --- php-src/NEWS:1.2027.2.547.2.1453Mon Mar 30 18:05:42 2009 +++ php-src/NEWSMon Mar 30 19:59:08 2009 @@ -1,4 +1,4 @@ -PHP NEWS +PHPNEWS ||| ?? ??? 2009, PHP 5.2.10 - Added new CURL options CURLOPT_REDIR_PROTOCOLS, CURLOPT_PROTOCOLS, @@ -7,6 +7,8 @@ - Fixed memory corruptions while reading properties of zip files. (Ilia) - Fixed memory leak in ob_get_clean/ob_get_flush. (Christian) +- Fixed bug #47831 (Compile warning for strnlen() in main/spprintf.c). + (Ilia, rainer dot jung at kippdata dot de) - Fixed bug #47828 (openssl_x509_parse() segfaults when a UTF-8 conversion fails). (Scott, Kees Cook, Pierre) - Fixed bug #47769 (Strange extends PDO). (Felipe) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl/tests bug47828.phpt
scottmacMon Mar 30 22:17:02 2009 UTC Modified files: /php-src/ext/openssl/tests bug47828.phpt Log: I wish people would test their changes before comitting, especially since the test is *IDENTICAL* as before just with different formatting. http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug47828.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/openssl/tests/bug47828.phpt diff -u php-src/ext/openssl/tests/bug47828.phpt:1.2 php-src/ext/openssl/tests/bug47828.phpt:1.3 --- php-src/ext/openssl/tests/bug47828.phpt:1.2 Mon Mar 30 18:06:22 2009 +++ php-src/ext/openssl/tests/bug47828.phpt Mon Mar 30 22:17:02 2009 @@ -30,7 +30,7 @@ M3dwifRsZyZyruy4tMsu -END CERTIFICATE- ; -$cert = str_replace(\\n, \n, $csr); +$cert = (binary)str_replace(\\n, \n, $csr); $arr = openssl_x509_parse($cert); var_dump($arr['hash']); echo Done; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
