[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed Nov 5 01:32:02 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3218r2=1.3219diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3218 php-src/ChangeLog:1.3219 --- php-src/ChangeLog:1.3218Tue Nov 4 01:32:17 2008 +++ php-src/ChangeLog Wed Nov 5 01:32:00 2008 @@ -1,3 +1,322 @@ +2008-11-04 Lukas Smith [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS: + fixed ext/msql NEWS entry + +* README.RELEASE_PROCESS: + added note about running scripts/dev/credits + +* (PHP_5_3) + NEWS: + ext/msql is now in PECL starting alpha3 [DOC] + +* ext/msql/.cvsignore + ext/msql/CREDITS + ext/msql/config.m4 + ext/msql/config.w32 + ext/msql/msql.dsp + ext/msql/php_msql.c + ext/msql/php_msql.h: + ext/msql has been moved from php-src to PECL adhead of PHP 5.3 + +2008-11-04 Arnaud Le Blanc [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN + +* (PHP_5_2) + ext/standard/php_fopen_wrapper.c + sapi/cli/tests/022.inc + sapi/cli/tests/022.phpt: + MFH: Open STDIN and php://stdin streams with the relevant + wrapper when the file descriptor is a socket (inetd, etc) + Fixes bug #43731 + +* ext/standard/php_fopen_wrapper.c + ext/standard/php_fopen_wrapper.c + sapi/cli/tests/022.inc + sapi/cli/tests/022.inc + sapi/cli/tests/022.inc + sapi/cli/tests/022.inc + sapi/cli/tests/022.phpt + sapi/cli/tests/022.phpt + sapi/cli/tests/022.phpt + sapi/cli/tests/022.phpt: + Open STDIN and php://stdin streams with the relevant + wrapper when the file descriptor is a socket (inetd, etc) + Fixes bug #43731 + +* main/network.c: + initialize memory + +2008-11-04 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/gd/gd.c: + - add png and jpeg version info + +2008-11-04 David Coallier [EMAIL PROTECTED] + +* (PHP_5_3) + ext/pdo/pdo_dbh.c: + - MFH + - Bug #44154: [DOC] Return 3 elements at all times. If the dbh stmt + doesn't have +an error code we used to return an array with one element. For the sake +of consistency and verification of returned values at userland we are + now +returning an array with 3 elements. Note the two last elements are null + but +present + + - Bug #4413: [DOC] If the error code returned by the DBH is null, we + return +a null value. This is used in order to help with empty error codes. + +* ext/pdo/pdo_dbh.c: + - Bug #44154: [DOC] Return 3 elements at all times. If the dbh stmt doesn't + have +an error code we used to return an array with one element. For the sake +of consistency and verification of returned values at userland we are + now +returning an array with 3 elements. Note the two last elements are null + but +present + + - Bug #44153: [DOC] If the error code returned by the DBH is null, we + return +a null value. This is used in order to help with empty error codes. + +2008-11-04 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + ZendEngine2/tests/bug43332_2.phpt + ext/standard/tests/serialize/bug42919.phpt: + - Fixed tests + +2008-11-04 Arnaud Le Blanc [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/standard/tests/streams/stream_get_line_nb.phpt + ext/standard/tests/streams/stream_get_line_nb.phpt + main/streams/streams.c + main/streams/streams.c: + MFH: Fixed stream_get_line() to behave as documented on non-blocking + streams + +* ext/standard/tests/streams/stream_get_line_nb.phpt + ext/standard/tests/streams/stream_get_line_nb.phpt + ext/standard/tests/streams/stream_get_line_nb.phpt + main/streams/streams.c: +1.1.4; + Fixed stream_get_line() to behave as documented on non-blocking streams + +* (PHP_5_2) + ext/standard/streamsfuncs.c + ext/standard/tests/streams/stream_socket_pair.phpt: + MFH: Avoids fclose() from complaining that stream_socket_pair() streams + have not been closed + +* (PHP_5_3) + ext/standard/streamsfuncs.c + ext/standard/tests/streams/stream_socket_pair.phpt: + MDH: Avoids fclose() from complaining that stream_socket_pair() streams + have not been closed + +* ext/standard/streamsfuncs.c + ext/standard/tests/streams/stream_socket_pair.phpt + ext/standard/tests/streams/stream_socket_pair.phpt + ext/standard/tests/streams/stream_socket_pair.phpt: + Avoids fclose() from complaining that stream_socket_pair() streams + have not been closed + +2008-11-04 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS + ZendEngine2/zend_API.c + ZendEngine2/zend_API.h + ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.h
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed Nov 5 01:32:06 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1391r2=1.1392diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1391 ZendEngine2/ChangeLog:1.1392 --- ZendEngine2/ChangeLog:1.1391Tue Nov 4 01:32:22 2008 +++ ZendEngine2/ChangeLog Wed Nov 5 01:32:06 2008 @@ -1,3 +1,143 @@ +2008-11-04 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + tests/bug43332_2.phpt: + - Fixed tests + +2008-11-04 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_3) + zend_API.c + zend_API.h + zend_compile.c + zend_compile.h + zend_constants.c + zend_execute_API.c + zend_language_parser.y + zend_language_scanner.c + zend_language_scanner.l + zend_language_scanner_defs.h + zend_vm_def.h + zend_vm_execute.h + tests/bug42802.phpt + tests/bug42819.phpt + tests/bug42820.phpt + tests/bug42859.phpt + tests/bug43183.phpt + tests/bug43332_1.phpt + tests/bug43332_2.phpt + tests/bug43343.phpt + tests/bug43344_10.phpt + tests/bug43344_11.phpt + tests/bug43344_12.phpt + tests/bug43344_13.phpt + tests/bug43344_2.phpt + tests/bug43344_3.phpt + tests/bug43344_4.phpt + tests/bug43344_5.phpt + tests/bug43344_6.phpt + tests/bug43344_7.phpt + tests/bug43344_8.phpt + tests/bug43344_9.phpt + tests/bug43651.phpt + tests/bug44653.phpt + tests/class_alias_012.phpt + tests/class_alias_013.phpt + tests/class_alias_015.phpt + tests/class_alias_016.phpt + tests/class_alias_019.phpt + tests/class_alias_020.phpt + tests/class_alias_021.phpt + tests/class_constants_004.phpt + tests/class_exists_001.phpt + tests/constants_003.phpt + tests/constants_004.phpt + tests/constants_006.phpt + tests/constants_009.phpt + tests/inter_02.phpt + tests/interface_exists_002.phpt + tests/lsb_014.phpt + tests/ns_001.phpt + tests/ns_002.phpt + tests/ns_003.phpt + tests/ns_004.phpt + tests/ns_005.phpt + tests/ns_006.phpt + tests/ns_007.phpt + tests/ns_008.phpt + tests/ns_009.phpt + tests/ns_010.phpt + tests/ns_011.phpt + tests/ns_012.phpt + tests/ns_013.phpt + tests/ns_014.phpt + tests/ns_015.phpt + tests/ns_016.phpt + tests/ns_017.phpt + tests/ns_018.phpt + tests/ns_019.phpt + tests/ns_020.phpt + tests/ns_021.phpt + tests/ns_022.phpt + tests/ns_023.phpt + tests/ns_025.phpt + tests/ns_026.phpt + tests/ns_027.inc + tests/ns_027.phpt + tests/ns_028.phpt + tests/ns_029.phpt + tests/ns_030.phpt + tests/ns_031.phpt + tests/ns_032.phpt + tests/ns_034.phpt + tests/ns_035.phpt + tests/ns_036.phpt + tests/ns_037.phpt + tests/ns_038.phpt + tests/ns_040.phpt + tests/ns_041.phpt + tests/ns_042.phpt + tests/ns_043.phpt + tests/ns_044.phpt + tests/ns_045.phpt + tests/ns_046.phpt + tests/ns_047.phpt + tests/ns_048.phpt + tests/ns_049.phpt + tests/ns_050.phpt + tests/ns_051.phpt + tests/ns_052.phpt + tests/ns_053.phpt + tests/ns_054.phpt + tests/ns_055.phpt + tests/ns_056.phpt + tests/ns_057.phpt + tests/ns_058.phpt + tests/ns_060.phpt + tests/ns_061.phpt + tests/ns_062.phpt + tests/ns_064.phpt + tests/ns_065.inc + tests/ns_065.phpt + tests/ns_066.phpt + tests/ns_067.inc + tests/ns_067.phpt: + - Next step in namespaces, using / as namespace separator. + +* tests/bug43128.phpt: + - Fix test + +* tests/ns_027.inc + tests/ns_065.inc + tests/ns_067.inc: + - MFB dos2unix + +* (PHP_5_3) + tests/ns_027.inc + tests/ns_065.inc + tests/ns_067.inc: + - Fix tests: dos2unix + 2008-11-03 Johannes Schlüter [EMAIL PROTECTED] * (PHP_5_3) @@ -26255,7 +26395,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1391 2008/11/04 01:32:22 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1392 2008/11/05 01:32:06 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -27979,7 +28119,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1391 2008/11/04 01:32:22 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1392 2008/11/05 01:32:06 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 util.c
Hi Marcus, I'm pretty sure this is a wrong fix - the check for not shared replaces the original check for HAVE_HASH_EXT, which is effectively a global equivalent to $PHP_HASH. So it should be something like: if test $PHP_HASH != no; then if test $PHP_HASH_SHARED != yes; then AC_DEFINE(PHAR_HASH_OK,1,[ ]) else AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) fi fi As far as I can tell that acomplishes the same. Onlz zou German kb? ;) changed the original logic a lot rather then trzing to keep as much of it as possible. Nope. The *original* logic said 'is it there?' Greg changed that to 'is it !shared?' You changed it back to 'is it there?' It needs to be 'is it there !shared?' The ext/hash files are already included as appropriate in phar_internal.h and don't/shouldn't need re-including anywhere else. Doesnät matter. This helps me figuring out what is wrong. In CVS? Also - it looks like ext/hash needs adding to phar_deps in phar.c (as ZEND_MOD_OPTIONAL). Zep, that's a good point. And config.w32 needs updating to define PHAR_HASH_OK, since there'll be zero hash support under doze otherwise. HAVE_HASH_EXT is at least automatic...! Since I cannot test on windows I need windows developers like zou to fix it. I haven't been able to test 5.3 in months.. I'll fix/test/merge out of PECL 5.2 once it's working under *nix, but currently it doesn't seem to be working anywhere :) - Steph -- 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 config.m4 util.c
Hello Steph, Tuesday, November 4, 2008, 2:42:05 PM, you wrote: Hi Marcus, I'm pretty sure this is a wrong fix - the check for not shared replaces the original check for HAVE_HASH_EXT, which is effectively a global equivalent to $PHP_HASH. So it should be something like: if test $PHP_HASH != no; then if test $PHP_HASH_SHARED != yes; then AC_DEFINE(PHAR_HASH_OK,1,[ ]) else AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) fi fi As far as I can tell that acomplishes the same. Onlz zou German kb? ;) oops changed the original logic a lot rather then trzing to keep as much of it as possible. Nope. The *original* logic said 'is it there?' Greg changed that to 'is it !shared?' You changed it back to 'is it there?' It needs to be 'is it there !shared?' read again. It says if it is shared then issue an error. If it is present then use it. The ext/hash files are already included as appropriate in phar_internal.h and don't/shouldn't need re-including anywhere else. Doesnät matter. This helps me figuring out what is wrong. In CVS? Also - it looks like ext/hash needs adding to phar_deps in phar.c (as ZEND_MOD_OPTIONAL). Zep, that's a good point. And config.w32 needs updating to define PHAR_HASH_OK, since there'll be zero hash support under doze otherwise. HAVE_HASH_EXT is at least automatic...! Since I cannot test on windows I need windows developers like zou to fix it. I haven't been able to test 5.3 in months.. I'll fix/test/merge out of PECL 5.2 once it's working under *nix, but currently it doesn't seem to be working anywhere :) - Steph Best regards, Marcus -- 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/phar phar.c
helly Tue Nov 4 14:04:30 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar.c Log: - MFH We only rely on hash if it is built-in http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.53r2=1.370.2.54diff_format=u Index: php-src/ext/phar/phar.c diff -u php-src/ext/phar/phar.c:1.370.2.53 php-src/ext/phar/phar.c:1.370.2.54 --- php-src/ext/phar/phar.c:1.370.2.53 Tue Nov 4 13:33:15 2008 +++ php-src/ext/phar/phar.c Tue Nov 4 14:04:29 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: phar.c,v 1.370.2.53 2008/11/04 13:33:15 helly Exp $ */ +/* $Id: phar.c,v 1.370.2.54 2008/11/04 14:04:29 helly Exp $ */ #define PHAR_MAIN 1 #include phar_internal.h @@ -3624,7 +3624,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.53 $); + php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.54 $); 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); @@ -3671,7 +3671,7 @@ ZEND_MOD_OPTIONAL(openssl) ZEND_MOD_OPTIONAL(zlib) ZEND_MOD_OPTIONAL(standard) -#if HAVE_HASH +#if defined(HAVE_HASH) !defined(COMPILE_DL_HASH) ZEND_MOD_REQUIRED(hash) #endif #if HAVE_SPL -- 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/phar phar.c
helly Tue Nov 4 13:33:15 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar.c Log: - MFH Add hash dependency at module source level http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.52r2=1.370.2.53diff_format=u Index: php-src/ext/phar/phar.c diff -u php-src/ext/phar/phar.c:1.370.2.52 php-src/ext/phar/phar.c:1.370.2.53 --- php-src/ext/phar/phar.c:1.370.2.52 Sun Oct 26 05:49:09 2008 +++ php-src/ext/phar/phar.c Tue Nov 4 13:33:15 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: phar.c,v 1.370.2.52 2008/10/26 05:49:09 cellog Exp $ */ +/* $Id: phar.c,v 1.370.2.53 2008/11/04 13:33:15 helly Exp $ */ #define PHAR_MAIN 1 #include phar_internal.h @@ -3624,7 +3624,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.52 $); + php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.53 $); 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); @@ -3671,6 +3671,9 @@ ZEND_MOD_OPTIONAL(openssl) ZEND_MOD_OPTIONAL(zlib) ZEND_MOD_OPTIONAL(standard) +#if HAVE_HASH + ZEND_MOD_REQUIRED(hash) +#endif #if HAVE_SPL ZEND_MOD_REQUIRED(spl) #endif -- 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/zip/tests bug38943.inc bug38943_2.phpt pecl12414.phpt pecl12414.zip
pajoye Tue Nov 4 13:24:40 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/zip/tests bug38943.inc bug38943_2.phpt pecl12414.phpt pecl12414.zip Log: - sync tests with pecl http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug38943.inc?view=markuprev=1.1 Index: php-src/ext/zip/tests/bug38943.inc +++ php-src/ext/zip/tests/bug38943.inc http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug38943_2.phpt?view=markuprev=1.1 Index: php-src/ext/zip/tests/bug38943_2.phpt +++ php-src/ext/zip/tests/bug38943_2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/pecl12414.phpt?view=markuprev=1.1 Index: php-src/ext/zip/tests/pecl12414.phpt +++ php-src/ext/zip/tests/pecl12414.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/pecl12414.zip?view=markuprev=1.1 Index: php-src/ext/zip/tests/pecl12414.zip +++ php-src/ext/zip/tests/pecl12414.zip -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/reflection php_reflection.c /ext/reflection/tests ReflectionFunction_getNamespaceName.phpt reflectionClass_getNamespaceName.phpt /ext/standard credit
Hello all, thanks Greg, I only found one important issue prior to submitting this. marcus Tuesday, November 4, 2008, 4:59:00 PM, you wrote: helly Tue Nov 4 15:59:00 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS /ZendEngine2zend_API.c zend_API.h zend_compile.c zend_compile.h zend_constants.c zend_execute_API.c zend_language_parser.y zend_language_scanner.c zend_language_scanner.l zend_language_scanner_defs.h zend_vm_def.h zend_vm_execute.h /ZendEngine2/tests bug42802.phpt bug42819.phpt bug42820.phpt bug42859.phpt bug43183.phpt bug43332_1.phpt bug43332_2.phpt bug43343.phpt bug43344_10.phpt bug43344_11.phpt bug43344_12.phpt bug43344_13.phpt bug43344_2.phpt bug43344_3.phpt bug43344_4.phpt bug43344_5.phpt bug43344_6.phpt bug43344_7.phpt bug43344_8.phpt bug43344_9.phpt bug43651.phpt bug44653.phpt class_alias_012.phpt class_alias_013.phpt class_alias_015.phpt class_alias_016.phpt class_alias_019.phpt class_alias_020.phpt class_alias_021.phpt class_constants_004.phpt class_exists_001.phpt constants_003.phpt constants_004.phpt constants_006.phpt constants_009.phpt inter_02.phpt interface_exists_002.phpt lsb_014.phpt ns_001.phpt ns_002.phpt ns_003.phpt ns_004.phpt ns_005.phpt ns_006.phpt ns_007.phpt ns_008.phpt ns_009.phpt ns_010.phpt ns_011.phpt ns_012.phpt ns_013.phpt ns_014.phpt ns_015.phpt ns_016.phpt ns_017.phpt ns_018.phpt ns_019.phpt ns_020.phpt ns_021.phpt ns_022.phpt ns_023.phpt ns_025.phpt ns_026.phpt ns_027.inc ns_027.phpt ns_028.phpt ns_029.phpt ns_030.phpt ns_031.phpt ns_032.phpt ns_034.phpt ns_035.phpt ns_036.phpt ns_037.phpt ns_038.phpt ns_040.phpt ns_041.phpt ns_042.phpt ns_043.phpt ns_044.phpt ns_045.phpt ns_046.phpt ns_047.phpt ns_048.phpt ns_049.phpt ns_050.phpt ns_051.phpt ns_052.phpt ns_053.phpt ns_054.phpt ns_055.phpt ns_056.phpt ns_057.phpt ns_058.phpt ns_060.phpt ns_061.phpt ns_062.phpt ns_064.phpt ns_065.inc ns_065.phpt ns_066.phpt ns_067.inc ns_067.phpt /php-src/ext/reflection php_reflection.c /php-src/ext/reflection/tests ReflectionFunction_getNamespaceName.phpt reflectionClass_getNamespaceName.phpt /php-src/ext/standard credits.c var_unserializer.c var_unserializer.re Log: - Next step in namespaces, using / as namespace separator. Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard streamsfuncs.c /ext/standard/tests/streams stream_socket_pair.phpt
lbarnaudTue Nov 4 16:45:42 2008 UTC
Added files:
/php-src/ext/standard/tests/streams stream_socket_pair.phpt
Modified files:
/php-src/ext/standard streamsfuncs.c
Log:
Avoids fclose() from complaining that stream_socket_pair() streams
have not been closed
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.128r2=1.129diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.128
php-src/ext/standard/streamsfuncs.c:1.129
--- php-src/ext/standard/streamsfuncs.c:1.128 Tue Nov 4 00:42:19 2008
+++ php-src/ext/standard/streamsfuncs.c Tue Nov 4 16:45:42 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.128 2008/11/04 00:42:19 lbarnaud Exp $ */
+/* $Id: streamsfuncs.c,v 1.129 2008/11/04 16:45:42 lbarnaud Exp $ */
#include php.h
#include php_globals.h
@@ -69,6 +69,11 @@
s1 = php_stream_sock_open_from_socket(pair[0], 0);
s2 = php_stream_sock_open_from_socket(pair[1], 0);
+ /* set the __exposed flag.
+* php_stream_to_zval() does, add_next_index_resource() does not */
+ php_stream_auto_cleanup(s1);
+ php_stream_auto_cleanup(s2);
+
add_next_index_resource(return_value, php_stream_get_resource_id(s1));
add_next_index_resource(return_value, php_stream_get_resource_id(s2));
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_socket_pair.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/streams/stream_socket_pair.phpt
+++ php-src/ext/standard/tests/streams/stream_socket_pair.phpt
--TEST--
stream_socket_pair()
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') die(skip: non windows test);
?
--FILE--
?php
$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
var_dump($sockets);
fwrite($sockets[0], bfoo);
var_dump(fread($sockets[1], strlen(bfoo)));
fclose($sockets[0]);
?
--EXPECTF--
array(2) {
[0]=
resource(%d) of type (stream)
[1]=
resource(%d) of type (stream)
}
string(3) foo
--
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 streamsfuncs.c /ext/standard/tests/streams stream_socket_pair.phpt
lbarnaudTue Nov 4 16:46:03 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/streams stream_socket_pair.phpt
Modified files:
/php-src/ext/standard streamsfuncs.c
Log:
MDH: Avoids fclose() from complaining that stream_socket_pair() streams
have not been closed
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.28r2=1.58.2.6.2.15.2.29diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.28
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.29
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.28 Tue Nov 4
00:42:41 2008
+++ php-src/ext/standard/streamsfuncs.c Tue Nov 4 16:46:03 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.28 2008/11/04 00:42:41 lbarnaud Exp $
*/
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.29 2008/11/04 16:46:03 lbarnaud Exp $
*/
#include php.h
#include php_globals.h
@@ -69,6 +69,11 @@
s1 = php_stream_sock_open_from_socket(pair[0], 0);
s2 = php_stream_sock_open_from_socket(pair[1], 0);
+ /* set the __exposed flag.
+* php_stream_to_zval() does, add_next_index_resource() does not */
+ php_stream_auto_cleanup(s1);
+ php_stream_auto_cleanup(s2);
+
add_next_index_resource(return_value, php_stream_get_resource_id(s1));
add_next_index_resource(return_value, php_stream_get_resource_id(s2));
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_socket_pair.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/streams/stream_socket_pair.phpt
+++ php-src/ext/standard/tests/streams/stream_socket_pair.phpt
--TEST--
stream_socket_pair()
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') die(skip: non windows test);
?
--FILE--
?php
$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
var_dump($sockets);
fwrite($sockets[0], bfoo);
var_dump(fread($sockets[1], strlen(bfoo)));
fclose($sockets[0]);
?
--EXPECTF--
array(2) {
[0]=
resource(%d) of type (stream)
[1]=
resource(%d) of type (stream)
}
string(3) foo
--
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 streamsfuncs.c /ext/standard/tests/streams stream_socket_pair.phpt
lbarnaudTue Nov 4 16:48:08 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/streams stream_socket_pair.phpt
Modified files:
/php-src/ext/standard streamsfuncs.c
Log:
MFH: Avoids fclose() from complaining that stream_socket_pair() streams
have not been closed
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.28r2=1.58.2.6.2.29diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.28
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.29
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.28 Tue Nov 4 00:43:06 2008
+++ php-src/ext/standard/streamsfuncs.c Tue Nov 4 16:48:07 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.28 2008/11/04 00:43:06 lbarnaud Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.29 2008/11/04 16:48:07 lbarnaud Exp $ */
#include php.h
#include php_globals.h
@@ -69,6 +69,11 @@
s1 = php_stream_sock_open_from_socket(pair[0], 0);
s2 = php_stream_sock_open_from_socket(pair[1], 0);
+ /* set the __exposed flag.
+* php_stream_to_zval() does, add_next_index_resource() does not */
+ php_stream_auto_cleanup(s1);
+ php_stream_auto_cleanup(s2);
+
add_next_index_resource(return_value, php_stream_get_resource_id(s1));
add_next_index_resource(return_value, php_stream_get_resource_id(s2));
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_socket_pair.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/streams/stream_socket_pair.phpt
+++ php-src/ext/standard/tests/streams/stream_socket_pair.phpt
--TEST--
stream_socket_pair()
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') die(skip: non windows test);
?
--FILE--
?php
$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
var_dump($sockets);
fwrite($sockets[0], bfoo);
var_dump(fread($sockets[1], strlen(bfoo)));
fclose($sockets[0]);
?
--EXPECTF--
array(2) {
[0]=
resource(%d) of type (stream)
[1]=
resource(%d) of type (stream)
}
string(3) foo
--
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/pdo_sqlite/sqlite/src .cvsignore
cellog Tue Nov 4 17:04:22 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdo_sqlite/sqlite/src .cvsignore Log: ignore stuff that clutters cvs diffs http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite/src/.cvsignore?r1=1.4.4.1.2.1r2=1.4.4.1.2.2diff_format=u Index: php-src/ext/pdo_sqlite/sqlite/src/.cvsignore diff -u /dev/null php-src/ext/pdo_sqlite/sqlite/src/.cvsignore:1.4.4.1.2.2 --- /dev/null Tue Nov 4 17:04:22 2008 +++ php-src/ext/pdo_sqlite/sqlite/src/.cvsignoreTue Nov 4 17:04:22 2008 @@ -0,0 +1,4 @@ +*.lo +*.o +.cvsignore +.libs -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/streams stream_get_line_nb.phpt /main/streams streams.c
lbarnaudTue Nov 4 17:05:17 2008 UTC
Added files:
/php-src/ext/standard/tests/streams stream_get_line_nb.phpt
Modified files:
/php-src/main/streams streams.c
Log:
Fixed stream_get_line() to behave as documented on non-blocking streams
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.172r2=1.173diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.172
php-src/main/streams/streams.c:1.173
--- php-src/main/streams/streams.c:1.172Mon Nov 3 23:28:45 2008
+++ php-src/main/streams/streams.c Tue Nov 4 17:05:17 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.172 2008/11/03 23:28:45 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.173 2008/11/04 17:05:17 lbarnaud Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1136,6 +1136,9 @@
}
if (!e) {
+ if (seek_len maxlen !stream-eof) {
+ return NULL;
+ }
toread = maxlen;
} else {
toread = e - stream-readbuf.s - stream-readpos;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_line_nb.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/streams/stream_get_line_nb.phpt
+++ php-src/ext/standard/tests/streams/stream_get_line_nb.phpt
--TEST--
stream_get_line() on non-blocking stream
--SKIPIF--
?php
$sockets = @stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
if (!$sockets) die(skip);
fclose($sockets[0]);
fclose($sockets[1]);
?
--FILE--
?php
/**
* Tests that stream_get_line() behaves as documented on non-blocking streams:
* Never return incomplete lines, except on documented conditions:
* length bytes have been read, the string specified by ending is found, EOF.
*/
$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
var_dump($sockets);
stream_set_blocking($sockets[1], 0);
$eol = b'EOL';
fwrite($sockets[0], bline start);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns
incomplete line (EOL not found)
var_dump(stream_get_line($sockets[1], 8192, $eol));
fwrite($sockets[0], b, line end);
fwrite($sockets[0], b, $eol);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Returns full line (EOL
found)
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Nothing to read
var_dump(stream_get_line($sockets[1], 8192, $eol));
fwrite($sockets[0], bincomplete line);
var_dump(stream_get_line($sockets[1], strlen(bincomplete line), $eol)); //
EOL not found but $length has been read, return incomplete line
fwrite($sockets[0], bincomplete line);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns
incomplete line (EOL not found)
var_dump(fread($sockets[1], strlen(bincomplete line))); // Returns buffer
readden by stream_get_line
fwrite($sockets[0], bend of file);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns
incomplete line (EOL not found)
fclose($sockets[0]);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Returns incomplete line
(End of file)
fclose($sockets[1]);
?
--EXPECTF--
array(2) {
[0]=
resource(%d) of type (stream)
[1]=
resource(%d) of type (stream)
}
bool(false)
bool(false)
string(22) line start, line end,
bool(false)
bool(false)
string(15) incomplete line
bool(false)
string(15) incomplete line
bool(false)
string(11) 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/standard/tests/streams stream_get_line_nb.phpt /main/streams streams.c
lbarnaudTue Nov 4 17:05:55 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/streams stream_get_line_nb.phpt
Modified files:
/php-src/main/streams streams.c
Log:
MFH: Fixed stream_get_line() to behave as documented on non-blocking
streams
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.18.2.17r2=1.82.2.6.2.18.2.18diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.18.2.17
php-src/main/streams/streams.c:1.82.2.6.2.18.2.18
--- php-src/main/streams/streams.c:1.82.2.6.2.18.2.17 Mon Nov 3 23:29:17 2008
+++ php-src/main/streams/streams.c Tue Nov 4 17:05:55 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.18.2.17 2008/11/03 23:29:17 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.18.2.18 2008/11/04 17:05:55 lbarnaud Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -890,6 +890,9 @@
}
if (!e) {
+ if (seek_len maxlen !stream-eof) {
+ return NULL;
+ }
toread = maxlen;
} else {
toread = e - (char *) stream-readbuf - stream-readpos;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_line_nb.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/streams/stream_get_line_nb.phpt
+++ php-src/ext/standard/tests/streams/stream_get_line_nb.phpt
--TEST--
stream_get_line() on non-blocking stream
--SKIPIF--
?php
$sockets = @stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
if (!$sockets) die(skip);
fclose($sockets[0]);
fclose($sockets[1]);
?
--FILE--
?php
/**
* Tests that stream_get_line() behaves as documented on non-blocking streams:
* Never return incomplete lines, except on documented conditions:
* length bytes have been read, the string specified by ending is found, EOF.
*/
$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
var_dump($sockets);
stream_set_blocking($sockets[1], 0);
$eol = b'EOL';
fwrite($sockets[0], bline start);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns
incomplete line (EOL not found)
var_dump(stream_get_line($sockets[1], 8192, $eol));
fwrite($sockets[0], b, line end);
fwrite($sockets[0], b, $eol);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Returns full line (EOL
found)
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Nothing to read
var_dump(stream_get_line($sockets[1], 8192, $eol));
fwrite($sockets[0], bincomplete line);
var_dump(stream_get_line($sockets[1], strlen(bincomplete line), $eol)); //
EOL not found but $length has been read, return incomplete line
fwrite($sockets[0], bincomplete line);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns
incomplete line (EOL not found)
var_dump(fread($sockets[1], strlen(bincomplete line))); // Returns buffer
readden by stream_get_line
fwrite($sockets[0], bend of file);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns
incomplete line (EOL not found)
fclose($sockets[0]);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Returns incomplete line
(End of file)
fclose($sockets[1]);
?
--EXPECTF--
array(2) {
[0]=
resource(%d) of type (stream)
[1]=
resource(%d) of type (stream)
}
bool(false)
bool(false)
string(22) line start, line end,
bool(false)
bool(false)
string(15) incomplete line
bool(false)
string(15) incomplete line
bool(false)
string(11) 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) / NEWS /ext/standard/tests/streams stream_get_line_nb.phpt /main/streams streams.c
lbarnaudTue Nov 4 17:07:21 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/streams stream_get_line_nb.phpt
Modified files:
/php-src/main/streams streams.c
/php-srcNEWS
Log:
MFH: Fixed stream_get_line() to behave as documented on non-blocking
streams
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.82.2.6.2.28r2=1.82.2.6.2.29diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.6.2.28
php-src/main/streams/streams.c:1.82.2.6.2.29
--- php-src/main/streams/streams.c:1.82.2.6.2.28Mon Nov 3 23:29:50 2008
+++ php-src/main/streams/streams.c Tue Nov 4 17:07:20 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.6.2.28 2008/11/03 23:29:50 lbarnaud Exp $ */
+/* $Id: streams.c,v 1.82.2.6.2.29 2008/11/04 17:07:20 lbarnaud Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -881,6 +881,9 @@
}
if (!e) {
+ if (seek_len maxlen !stream-eof) {
+ return NULL;
+ }
toread = maxlen;
} else {
toread = e - (char *) stream-readbuf - stream-readpos;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1301r2=1.2027.2.547.2.1302diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1301 php-src/NEWS:1.2027.2.547.2.1302
--- php-src/NEWS:1.2027.2.547.2.1301Tue Nov 4 00:43:06 2008
+++ php-src/NEWSTue Nov 4 17:07:20 2008
@@ -43,6 +43,8 @@
filter). (Arnaud)
- Fixed bug #42294 (Unified solution for round() based on C99 round). (Ilia)
+- Fixed stream_get_line() to behave as documented on non-blocking streams.
+ (Arnaud)
- Fixed endless loop in PDOStatement::debugDumpParams().
(jonah.harris at gmail dot com)
- Fixed ability to use internal heaps in extensions. (Arnaud, Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/streams/stream_get_line_nb.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/streams/stream_get_line_nb.phpt
+++ php-src/ext/standard/tests/streams/stream_get_line_nb.phpt
--TEST--
stream_get_line() on non-blocking stream
--SKIPIF--
?php
$sockets = @stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
if (!$sockets) die(skip);
fclose($sockets[0]);
fclose($sockets[1]);
?
--FILE--
?php
/**
* Tests that stream_get_line() behaves as documented on non-blocking streams:
* Never return incomplete lines, except on documented conditions:
* length bytes have been read, the string specified by ending is found, EOF.
*/
$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
var_dump($sockets);
stream_set_blocking($sockets[1], 0);
$eol = b'EOL';
fwrite($sockets[0], bline start);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns
incomplete line (EOL not found)
var_dump(stream_get_line($sockets[1], 8192, $eol));
fwrite($sockets[0], b, line end);
fwrite($sockets[0], b, $eol);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Returns full line (EOL
found)
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Nothing to read
var_dump(stream_get_line($sockets[1], 8192, $eol));
fwrite($sockets[0], bincomplete line);
var_dump(stream_get_line($sockets[1], strlen(bincomplete line), $eol)); //
EOL not found but $length has been read, return incomplete line
fwrite($sockets[0], bincomplete line);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns
incomplete line (EOL not found)
var_dump(fread($sockets[1], strlen(bincomplete line))); // Returns buffer
readden by stream_get_line
fwrite($sockets[0], bend of file);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Does not returns
incomplete line (EOL not found)
fclose($sockets[0]);
var_dump(stream_get_line($sockets[1], 8192, $eol)); // Returns incomplete line
(End of file)
fclose($sockets[1]);
?
--EXPECTF--
array(2) {
[0]=
resource(%d) of type (stream)
[1]=
resource(%d) of type (stream)
}
bool(false)
bool(false)
string(22) line start, line end,
bool(false)
bool(false)
string(15) incomplete line
bool(false)
string(15) incomplete line
bool(false)
string(11) 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/standard/tests/serialize bug42919.phpt ZendEngine2/tests bug43332_2.phpt
felipe Tue Nov 4 17:50:30 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2/tests bug43332_2.phpt
/php-src/ext/standard/tests/serialize bug42919.phpt
Log:
- Fixed tests
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug43332_2.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: ZendEngine2/tests/bug43332_2.phpt
diff -u ZendEngine2/tests/bug43332_2.phpt:1.1.2.2
ZendEngine2/tests/bug43332_2.phpt:1.1.2.3
--- ZendEngine2/tests/bug43332_2.phpt:1.1.2.2 Tue Nov 4 15:58:54 2008
+++ ZendEngine2/tests/bug43332_2.phpt Tue Nov 4 17:50:30 2008
@@ -12,4 +12,4 @@
$foo-bar($foo); // Ok!
$foo-bar(new stdclass); // Error, ok!
--EXPECTF--
-Fatal error: 'self' is an invalid class name in %sbug43332_2.php on line 5
+Fatal error: '\self' is an invalid class name in %sbug43332_2.php on line 5
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/serialize/bug42919.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/serialize/bug42919.phpt
diff -u php-src/ext/standard/tests/serialize/bug42919.phpt:1.1.2.1
php-src/ext/standard/tests/serialize/bug42919.phpt:1.1.2.2
--- php-src/ext/standard/tests/serialize/bug42919.phpt:1.1.2.1 Wed Oct 17
10:36:33 2007
+++ php-src/ext/standard/tests/serialize/bug42919.phpt Tue Nov 4 17:50:30 2008
@@ -10,5 +10,5 @@
echo get_class($x) . \n;
?
--EXPECT--
-O:8:Foo::Bar:0:{}
-Foo::Bar
+O:7:Foo\Bar:0:{}
+Foo\Bar
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c
davidc Tue Nov 4 18:25:26 2008 UTC
Modified files:
/php-src/ext/pdopdo_dbh.c
Log:
- Bug #44154: [DOC] Return 3 elements at all times. If the dbh stmt doesn't
have
an error code we used to return an array with one element. For the sake
of consistency and verification of returned values at userland we are now
returning an array with 3 elements. Note the two last elements are null but
present
- Bug #44153: [DOC] If the error code returned by the DBH is null, we return
a null value. This is used in order to help with empty error codes.
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.153r2=1.154diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.153 php-src/ext/pdo/pdo_dbh.c:1.154
--- php-src/ext/pdo/pdo_dbh.c:1.153 Thu Oct 9 12:59:47 2008
+++ php-src/ext/pdo/pdo_dbh.c Tue Nov 4 18:25:26 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.153 2008/10/09 12:59:47 felipe Exp $ */
+/* $Id: pdo_dbh.c,v 1.154 2008/11/04 18:25:26 davidc Exp $ */
/* The PDO Database Handle Class */
@@ -988,7 +988,12 @@
if (dbh-query_stmt) {
RETURN_STRING(dbh-query_stmt-error_code, 1);
}
-
+
+ if (dbh-error_code[0] == '\0') {
+ RETURN_NULL();
+ }
+
+ // Fallback to default documented value
RETURN_STRING(dbh-error_code, 1);
}
/* }}} */
@@ -1010,6 +1015,8 @@
add_next_index_string(return_value,
dbh-query_stmt-error_code, 1);
} else {
add_next_index_string(return_value, dbh-error_code, 1);
+ add_next_index_null(return_value);
+ add_next_index_null(return_value);
}
if (dbh-methods-fetch_err) {
dbh-methods-fetch_err(dbh, dbh-query_stmt, return_value
TSRMLS_CC);
--
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/pdo pdo_dbh.c
davidc Tue Nov 4 18:28:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdopdo_dbh.c
Log:
- MFH
- Bug #44154: [DOC] Return 3 elements at all times. If the dbh stmt doesn't
have
an error code we used to return an array with one element. For the sake
of consistency and verification of returned values at userland we are now
returning an array with 3 elements. Note the two last elements are null but
present
- Bug #4413: [DOC] If the error code returned by the DBH is null, we return
a null value. This is used in order to help with empty error codes.
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.13r2=1.82.2.31.2.17.2.14diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.13
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.14
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.13 Thu Oct 9 13:00:58 2008
+++ php-src/ext/pdo/pdo_dbh.c Tue Nov 4 18:28:41 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.13 2008/10/09 13:00:58 felipe Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.14 2008/11/04 18:28:41 davidc Exp $ */
/* The PDO Database Handle Class */
@@ -983,6 +983,11 @@
RETURN_STRING(dbh-query_stmt-error_code, 1);
}
+ if (dbh-error_code[0] == '\0') {
+ RETURN_NULL();
+ }
+
+ // Then we get back to the default fallback
RETURN_STRING(dbh-error_code, 1);
}
/* }}} */
@@ -1004,6 +1009,8 @@
add_next_index_string(return_value,
dbh-query_stmt-error_code, 1);
} else {
add_next_index_string(return_value, dbh-error_code, 1);
+ add_next_index_null(return_value);
+ add_next_index_null(return_value);
}
if (dbh-methods-fetch_err) {
dbh-methods-fetch_err(dbh, dbh-query_stmt, return_value
TSRMLS_CC);
--
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 config.m4 util.c
Hi Marcus, I'm pretty sure this is a wrong fix - the check for not shared replaces the original check for HAVE_HASH_EXT, which is effectively a global equivalent to $PHP_HASH. So it should be something like: if test $PHP_HASH != no; then if test $PHP_HASH_SHARED != yes; then AC_DEFINE(PHAR_HASH_OK,1,[ ]) else AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) fi fi The ext/hash files are already included as appropriate in phar_internal.h and don't/shouldn't need re-including anywhere else. Also - it looks like ext/hash needs adding to phar_deps in phar.c (as ZEND_MOD_OPTIONAL). And config.w32 needs updating to define PHAR_HASH_OK, since there'll be zero hash support under doze otherwise. HAVE_HASH_EXT is at least automatic...! - Steph - Original Message - From: Marcus Boerger [EMAIL PROTECTED] To: php-cvs@lists.php.net Sent: Tuesday, November 04, 2008 1:27 AM Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 util.c helly Tue Nov 4 01:27:52 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 util.c Log: - MFH Fix dependency from Phar to hash http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.7r2=1.27.2.8diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.7 php-src/ext/phar/config.m4:1.27.2.8 --- php-src/ext/phar/config.m4:1.27.2.7 Thu Oct 9 00:50:46 2008 +++ php-src/ext/phar/config.m4 Tue Nov 4 01:27:52 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27.2.7 2008/10/09 00:50:46 cellog Exp $ +dnl $Id: config.m4,v 1.27.2.8 2008/11/04 01:27:52 helly Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, @@ -8,7 +8,9 @@ PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) AC_MSG_CHECKING([for phar openssl support]) if test $PHP_HASH_SHARED != yes; then -AC_DEFINE(PHAR_HASH_OK,1,[ ]) +if test $PHP_HASH != no; then + AC_DEFINE(PHAR_HASH_OK,1,[ ]) +fi else AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) fi @@ -22,6 +24,7 @@ AC_MSG_RESULT([no]) fi fi + PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT fi http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.39r2=1.55.2.40diff_format=u Index: php-src/ext/phar/util.c diff -u php-src/ext/phar/util.c:1.55.2.39 php-src/ext/phar/util.c:1.55.2.40 --- php-src/ext/phar/util.c:1.55.2.39 Sun Oct 26 05:49:09 2008 +++ php-src/ext/phar/util.c Tue Nov 4 01:27:52 2008 @@ -18,9 +18,12 @@ +--+ */ -/* $Id: util.c,v 1.55.2.39 2008/10/26 05:49:09 cellog Exp $ */ +/* $Id: util.c,v 1.55.2.40 2008/11/04 01:27:52 helly Exp $ */ #include phar_internal.h +#ifdef PHAR_HASH_OK +#include ext/hash/php_hash_sha.h +#endif #ifdef PHAR_HAVE_OPENSSL /* OpenSSL includes */ -- 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] Re: [PHP-DOC] cvs: php-src(PHP_5_3) /ext/pdo pdo_dbh.c
Em Ter, 2008-11-04 às 18:28 +, David Coallier escreveu:
davidcTue Nov 4 18:28:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo pdo_dbh.c
Log:
- MFH
- Bug #44154: [DOC] Return 3 elements at all times. If the dbh stmt doesn't
have
an error code we used to return an array with one element. For the sake
of consistency and verification of returned values at userland we are now
returning an array with 3 elements. Note the two last elements are null
but
present
- Bug #4413: [DOC] If the error code returned by the DBH is null, we return
a null value. This is used in order to help with empty error codes.
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.13r2=1.82.2.31.2.17.2.14diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.13
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.14
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.13 Thu Oct 9 13:00:58 2008
+++ php-src/ext/pdo/pdo_dbh.c Tue Nov 4 18:28:41 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.13 2008/10/09 13:00:58 felipe Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.14 2008/11/04 18:28:41 davidc Exp $ */
/* The PDO Database Handle Class */
@@ -983,6 +983,11 @@
RETURN_STRING(dbh-query_stmt-error_code, 1);
}
+ if (dbh-error_code[0] == '\0') {
+ RETURN_NULL();
+ }
+
+ // Then we get back to the default fallback
RETURN_STRING(dbh-error_code, 1);
}
/* }}} */
@@ -1004,6 +1009,8 @@
add_next_index_string(return_value,
dbh-query_stmt-error_code, 1);
} else {
add_next_index_string(return_value, dbh-error_code, 1);
+ add_next_index_null(return_value);
+ add_next_index_null(return_value);
}
if (dbh-methods-fetch_err) {
dbh-methods-fetch_err(dbh, dbh-query_stmt, return_value
TSRMLS_CC);
I think that broken some tests:
PDO::MYSQL_ATTR_INIT_COMMAND
[ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt]
MySQL PDO-errorInfo() [ext/pdo_mysql/tests/pdo_mysql_errorinfo.phpt]
MySQL PDO-exec(), affected rows
[ext/pdo_mysql/tests/pdo_mysql_exec.phpt]
MySQL PDO-exec(), SELECT
[ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt]
MySQL PDOStatement-errorInfo();
[ext/pdo_mysql/tests/pdo_mysql_stmt_errorinfo.phpt]
And the // comment-style is incorrect, see CODING_STANDARDS file.
--
Regards,
Felipe Pena
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src(PHP_5_3) /ext/pdo pdo_dbh.c
On Tue, 2008-11-04 at 18:28 +, David Coallier wrote:
@@ -1004,6 +1009,8 @@
add_next_index_string(return_value,
dbh-query_stmt-error_code, 1);
} else {
add_next_index_string(return_value, dbh-error_code, 1);
+ add_next_index_null(return_value);
+ add_next_index_null(return_value);
}
if (dbh-methods-fetch_err) {
dbh-methods-fetch_err(dbh, dbh-query_stmt, return_value
TSRMLS_CC);
The error handler's fetch_err will most likely do a add_next_index_*
call too, that will give you 5 elements. *if* you really want to fix
that you should check the array size after calling the driver's
fetch_error and add missing elements, while I don't know if it's really
worth the trouble...
johannes
p.s. we need a stricter PDO spec :-(
--
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 config.m4 util.c
Nope. The *original* logic said 'is it there?' Greg changed that to 'is it !shared?' You changed it back to 'is it there?' It needs to be 'is it there !shared?' read again. It says if it is shared then issue an error. If it is present then use it. Args, sorry. I misread the commit and thought you'd removed the first line in that block, so yes the check is now correct in config.m4. But - since when is hash not optional? - Steph -- 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 config.m4 util.c
Hello Steph, Tuesday, November 4, 2008, 2:52:48 PM, you wrote: Nope. The *original* logic said 'is it there?' Greg changed that to 'is it !shared?' You changed it back to 'is it there?' It needs to be 'is it there !shared?' read again. It says if it is shared then issue an error. If it is present then use it. Args, sorry. I misread the commit and thought you'd removed the first line in that block, so yes the check is now correct in config.m4. But - since when is hash not optional? It still is optional :-) Only if it is shared we cannot rely on it for higher SHA. Best regards, Marcus -- 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 config.m4 util.c
But - since when is hash not optional? It still is optional :-) Only if it is shared we cannot rely on it for higher SHA. Grr no exports. OK, gotcha now, sorry for the noise. - Steph -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd gd.c
pajoye Tue Nov 4 20:24:46 2008 UTC
Modified files:
/php-src/ext/gd gd.c
Log:
- add png and jpeg version info
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.397r2=1.398diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.397 php-src/ext/gd/gd.c:1.398
--- php-src/ext/gd/gd.c:1.397 Sun Nov 2 21:10:08 2008
+++ php-src/ext/gd/gd.c Tue Nov 4 20:24:46 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.397 2008/11/02 21:10:08 felipe Exp $ */
+/* $Id: gd.c,v 1.398 2008/11/04 20:24:46 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1327,10 +1327,16 @@
php_info_print_table_row(2, GIF Create Support, enabled);
#endif
#ifdef HAVE_GD_JPG
- php_info_print_table_row(2, JPG Support, enabled);
+ {
+ char tmp[256];
+ snprintf(tmp, sizeof(tmp), %d, JPEG_LIB_VERSION);
+ php_info_print_table_row(2, JPG Support, enabled);
+ php_info_print_table_row(2, libJPEG Version, tmp);
+ }
#endif
#ifdef HAVE_GD_PNG
php_info_print_table_row(2, PNG Support, enabled);
+ php_info_print_table_row(2, libPNG Version, PNG_LIBPNG_VER_STRING);
#endif
php_info_print_table_row(2, WBMP Support, enabled);
#if defined(HAVE_GD_XPM) defined(HAVE_GD_BUNDLED)
--
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/gd gd.c
pajoye Tue Nov 4 20:25:45 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gd gd.c
Log:
- MFH: add png and jpeg version info
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.21r2=1.312.2.20.2.32.2.22diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.21
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.22
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.21Sun Nov 2 21:19:31 2008
+++ php-src/ext/gd/gd.c Tue Nov 4 20:25:45 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.21 2008/11/02 21:19:31 felipe Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.22 2008/11/04 20:25:45 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -33,6 +33,10 @@
/* needs to be first */
#include png.h
#endif
+#ifdef HAVE_GD_JPG
+/* needs to be first */
+#include jpeglib.h
+#endif
#include php.h
#include php_ini.h
@@ -1390,10 +1394,16 @@
php_info_print_table_row(2, GIF Create Support, enabled);
#endif
#ifdef HAVE_GD_JPG
- php_info_print_table_row(2, JPG Support, enabled);
+ {
+ char tmp[256];
+ snprintf(tmp, sizeof(tmp), %d, JPEG_LIB_VERSION);
+ php_info_print_table_row(2, JPG Support, enabled);
+ php_info_print_table_row(2, libJPEG Version, tmp);
+ }
#endif
#ifdef HAVE_GD_PNG
php_info_print_table_row(2, PNG Support, enabled);
+ php_info_print_table_row(2, libPNG Version, PNG_LIBPNG_VER_STRING);
#endif
#ifdef HAVE_GD_WBMP
php_info_print_table_row(2, WBMP Support, enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main network.c
lbarnaudTue Nov 4 20:40:04 2008 UTC
Modified files:
/php-src/main network.c
Log:
initialize memory
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.136r2=1.137diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.136 php-src/main/network.c:1.137
--- php-src/main/network.c:1.136Fri Oct 24 10:44:19 2008
+++ php-src/main/network.c Tue Nov 4 20:40:04 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.136 2008/10/24 10:44:19 felipe Exp $ */
+/* $Id: network.c,v 1.137 2008/11/04 20:40:04 lbarnaud Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -647,6 +647,7 @@
{
php_sockaddr_storage sa;
socklen_t sl = sizeof(sa);
+ memset(sa, 0, sizeof(sa));
if (getpeername(sock, (struct sockaddr*)sa, sl) == 0) {
php_network_populate_name_from_sockaddr((struct sockaddr*)sa,
sl,
@@ -666,6 +667,7 @@
{
php_sockaddr_storage sa;
socklen_t sl = sizeof(sa);
+ memset(sa, 0, sizeof(sa));
if (getsockname(sock, (struct sockaddr*)sa, sl) == 0) {
php_network_populate_name_from_sockaddr((struct sockaddr*)sa,
sl,
--
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) /main network.c
lbarnaudTue Nov 4 20:40:30 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main network.c
Log:
MFH: initialize memory
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.6.2.9r2=1.118.2.2.2.6.2.10diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.6.2.9
php-src/main/network.c:1.118.2.2.2.6.2.10
--- php-src/main/network.c:1.118.2.2.2.6.2.9Fri Oct 24 10:44:43 2008
+++ php-src/main/network.c Tue Nov 4 20:40:30 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.118.2.2.2.6.2.9 2008/10/24 10:44:43 felipe Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.6.2.10 2008/11/04 20:40:30 lbarnaud Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -647,6 +647,7 @@
{
php_sockaddr_storage sa;
socklen_t sl = sizeof(sa);
+ memset(sa, 0, sizeof(sa));
if (getpeername(sock, (struct sockaddr*)sa, sl) == 0) {
php_network_populate_name_from_sockaddr((struct sockaddr*)sa,
sl,
@@ -666,6 +667,7 @@
{
php_sockaddr_storage sa;
socklen_t sl = sizeof(sa);
+ memset(sa, 0, sizeof(sa));
if (getsockname(sock, (struct sockaddr*)sa, sl) == 0) {
php_network_populate_name_from_sockaddr((struct sockaddr*)sa,
sl,
--
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) /main network.c
lbarnaudTue Nov 4 20:41:37 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main network.c
Log:
MFH: initialize memory
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.11r2=1.118.2.2.2.12diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.11
php-src/main/network.c:1.118.2.2.2.12
--- php-src/main/network.c:1.118.2.2.2.11 Fri Oct 24 10:46:05 2008
+++ php-src/main/network.c Tue Nov 4 20:41:37 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: network.c,v 1.118.2.2.2.11 2008/10/24 10:46:05 felipe Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.12 2008/11/04 20:41:37 lbarnaud Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -641,6 +641,7 @@
{
php_sockaddr_storage sa;
socklen_t sl = sizeof(sa);
+ memset(sa, 0, sizeof(sa));
if (getpeername(sock, (struct sockaddr*)sa, sl) == 0) {
php_network_populate_name_from_sockaddr((struct sockaddr*)sa,
sl,
@@ -660,6 +661,7 @@
{
php_sockaddr_storage sa;
socklen_t sl = sizeof(sa);
+ memset(sa, 0, sizeof(sa));
if (getsockname(sock, (struct sockaddr*)sa, sl) == 0) {
php_network_populate_name_from_sockaddr((struct sockaddr*)sa,
sl,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DOC] cvs: php-src(PHP_5_3) /ext/pdo pdo_dbh.c
2008/11/4 Felipe Pena [EMAIL PROTECTED]
Em Ter, 2008-11-04 às 18:28 +, David Coallier escreveu:
davidcTue Nov 4 18:28:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo pdo_dbh.c
Log:
- MFH
- Bug #44154: [DOC] Return 3 elements at all times. If the dbh stmt
doesn't have
an error code we used to return an array with one element. For the
sake
of consistency and verification of returned values at userland we are
now
returning an array with 3 elements. Note the two last elements are
null but
present
- Bug #4413: [DOC] If the error code returned by the DBH is null, we
return
a null value. This is used in order to help with empty error codes.
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.13r2=1.82.2.31.2.17.2.14diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.13
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.14
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.13 Thu Oct 9 13:00:58
2008
+++ php-src/ext/pdo/pdo_dbh.c Tue Nov 4 18:28:41 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.13 2008/10/09 13:00:58 felipe Exp $
*/
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.14 2008/11/04 18:28:41 davidc Exp $
*/
/* The PDO Database Handle Class */
@@ -983,6 +983,11 @@
RETURN_STRING(dbh-query_stmt-error_code, 1);
}
+ if (dbh-error_code[0] == '\0') {
+ RETURN_NULL();
+ }
+
+ // Then we get back to the default fallback
RETURN_STRING(dbh-error_code, 1);
}
/* }}} */
@@ -1004,6 +1009,8 @@
add_next_index_string(return_value,
dbh-query_stmt-error_code, 1);
} else {
add_next_index_string(return_value, dbh-error_code, 1);
+ add_next_index_null(return_value);
+ add_next_index_null(return_value);
}
if (dbh-methods-fetch_err) {
dbh-methods-fetch_err(dbh, dbh-query_stmt, return_value
TSRMLS_CC);
I think that broken some tests:
PDO::MYSQL_ATTR_INIT_COMMAND
[ext/pdo_mysql/tests/pdo_mysql_attr_init_command.phpt]
MySQL PDO-errorInfo() [ext/pdo_mysql/tests/pdo_mysql_errorinfo.phpt]
MySQL PDO-exec(), affected rows
[ext/pdo_mysql/tests/pdo_mysql_exec.phpt]
MySQL PDO-exec(), SELECT
[ext/pdo_mysql/tests/pdo_mysql_exec_select.phpt]
MySQL PDOStatement-errorInfo();
[ext/pdo_mysql/tests/pdo_mysql_stmt_errorinfo.phpt]
Oh yeah I'll fix them.
And the // comment-style is incorrect, see CODING_STANDARDS file.
Oops
Thanks I'll fix it now.
--
Slan,
David
[PHP-CVS] cvs: php-src /ext/standard php_fopen_wrapper.c /sapi/cli/tests 022.inc 022.phpt
lbarnaudTue Nov 4 21:04:28 2008 UTC
Added files:
/php-src/sapi/cli/tests 022.phpt 022.inc
Modified files:
/php-src/ext/standard php_fopen_wrapper.c
Log:
Open STDIN and php://stdin streams with the relevant
wrapper when the file descriptor is a socket (inetd, etc)
Fixes bug #43731
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_fopen_wrapper.c?r1=1.63r2=1.64diff_format=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.63
php-src/ext/standard/php_fopen_wrapper.c:1.64
--- php-src/ext/standard/php_fopen_wrapper.c:1.63 Sat Aug 2 06:37:34 2008
+++ php-src/ext/standard/php_fopen_wrapper.cTue Nov 4 21:04:28 2008
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.63 2008/08/02 06:37:34 lbarnaud Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.64 2008/11/04 21:04:28 lbarnaud Exp $ */
#include stdio.h
#include stdlib.h
@@ -302,9 +302,23 @@
return NULL;
}
+#if defined(S_IFSOCK) !defined(WIN32) !defined(__BEOS__)
+ do {
+ struct stat st;
+ memset(st, 0, sizeof(st));
+ if (fstat(fd, st) == 0 (st.st_mode S_IFMT) == S_IFSOCK) {
+ stream = php_stream_sock_open_from_socket(fd, NULL);
+ if (stream) {
+ stream-ops = php_stream_socket_ops;
+ return stream;
+ }
+ }
+ } while (0);
+#endif
+
if (file) {
stream = php_stream_fopen_from_file(file, mode);
- } else {
+ } else {
stream = php_stream_fopen_from_fd(fd, mode, NULL);
if (stream == NULL) {
close(fd);
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/022.phpt?view=markuprev=1.1
Index: php-src/sapi/cli/tests/022.phpt
+++ php-src/sapi/cli/tests/022.phpt
--TEST--
STDIN/OUT/ERR stream type
--SKIPIF--
?php
if (!getenv(TEST_PHP_EXECUTABLE)) die(skip TEST_PHP_EXECUTABLE not set);
if (substr(PHP_OS, 0, 3) == WIN) die(skip non windows test);
?
--FILE--
?php
$php = getenv(TEST_PHP_EXECUTABLE);
$socket_file = dirname(__FILE__) . '/' . pathinfo(__FILE__, PATHINFO_FILENAME)
. '.sock';
$test_file = dirname(__FILE__) . '/' . pathinfo(__FILE__, PATHINFO_FILENAME) .
'.inc';
if (file_exists($socket_file)) {
unlink($socket_file);
}
$socket = stream_socket_server('unix://' . $socket_file);
var_dump($socket);
if (!$socket) {
exit(1);
}
$desc = array(
0 = $socket,
1 = STDOUT,
2 = STDERR,
);
$pipes = array();
$proc = proc_open($php -n . escapeshellarg($test_file), $desc, $pipes);
var_dump($proc);
if (!$proc) {
exit(1);
}
$client_socket = stream_socket_client('unix://' . $socket_file);
var_dump($client_socket);
echo stream_get_contents($client_socket);
fclose($client_socket);
proc_terminate($proc);
proc_close($proc);
unlink($socket_file);
?
--EXPECTF--
resource(%d) of type (stream)
resource(%d) of type (process)
resource(%d) of type (stream)
resource(%d) of type (stream)
resource(%d) of type (stream)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/022.inc?view=markuprev=1.1
Index: php-src/sapi/cli/tests/022.inc
+++ php-src/sapi/cli/tests/022.inc
?php
ob_start();
var_dump(STDIN);
$fd = fopen(php://stdin,r);
var_dump($fd);
$client_socket = stream_socket_accept($fd);
$data = ob_get_clean();
fwrite($client_socket, $data);
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / avail
On Mon, Nov 3, 2008 at 14:47, Pierre-Alain Joye [EMAIL PROTECTED] wrote: pajoye Mon Nov 3 13:47:27 2008 UTC Modified files: /CVSROOTavail Log: - karmas for php-windows-web http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1462r2=1.1463diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1462 CVSROOT/avail:1.1463 --- CVSROOT/avail:1.1462Sun Nov 2 16:46:01 2008 +++ CVSROOT/avail Mon Nov 3 13:47:26 2008 @@ -346,7 +346,7 @@ # php-internals-win karma avail|pajoye,rrichards,auroraeosrose|php-internals-win -avail|pajoye,guilhermeblanco|phpwinweb +avail|pajoye,guilhermeblanco,auroraeosrose,rrichards|php-windows-web Maybe throw it into the usual php websites pool too? -Hannes -- 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 php_fopen_wrapper.c /sapi/cli/tests 022.inc 022.phpt
lbarnaudTue Nov 4 21:05:31 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/sapi/cli/tests 022.phpt 022.inc
Modified files:
/php-src/ext/standard php_fopen_wrapper.c
Log:
Open STDIN and php://stdin streams with the relevant
wrapper when the file descriptor is a socket (inetd, etc)
Fixes bug #43731
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_fopen_wrapper.c?r1=1.45.2.4.2.7.2.3r2=1.45.2.4.2.7.2.4diff_format=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.7.2.3
php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.7.2.4
--- php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.7.2.3 Sat Aug 2
06:35:41 2008
+++ php-src/ext/standard/php_fopen_wrapper.cTue Nov 4 21:05:31 2008
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.45.2.4.2.7.2.3 2008/08/02 06:35:41 lbarnaud
Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.45.2.4.2.7.2.4 2008/11/04 21:05:31 lbarnaud
Exp $ */
#include stdio.h
#include stdlib.h
@@ -291,9 +291,23 @@
return NULL;
}
+#if defined(S_IFSOCK) !defined(WIN32) !defined(__BEOS__)
+ do {
+ struct stat st;
+ memset(st, 0, sizeof(st));
+ if (fstat(fd, st) == 0 (st.st_mode S_IFMT) == S_IFSOCK) {
+ stream = php_stream_sock_open_from_socket(fd, NULL);
+ if (stream) {
+ stream-ops = php_stream_socket_ops;
+ return stream;
+ }
+ }
+ } while (0);
+#endif
+
if (file) {
stream = php_stream_fopen_from_file(file, mode);
- } else {
+ } else {
stream = php_stream_fopen_from_fd(fd, mode, NULL);
if (stream == NULL) {
close(fd);
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/022.phpt?view=markuprev=1.1
Index: php-src/sapi/cli/tests/022.phpt
+++ php-src/sapi/cli/tests/022.phpt
--TEST--
STDIN/OUT/ERR stream type
--SKIPIF--
?php
if (!getenv(TEST_PHP_EXECUTABLE)) die(skip TEST_PHP_EXECUTABLE not set);
if (substr(PHP_OS, 0, 3) == WIN) die(skip non windows test);
?
--FILE--
?php
$php = getenv(TEST_PHP_EXECUTABLE);
$socket_file = dirname(__FILE__) . '/' . pathinfo(__FILE__, PATHINFO_FILENAME)
. '.sock';
$test_file = dirname(__FILE__) . '/' . pathinfo(__FILE__, PATHINFO_FILENAME) .
'.inc';
if (file_exists($socket_file)) {
unlink($socket_file);
}
$socket = stream_socket_server('unix://' . $socket_file);
var_dump($socket);
if (!$socket) {
exit(1);
}
$desc = array(
0 = $socket,
1 = STDOUT,
2 = STDERR,
);
$pipes = array();
$proc = proc_open($php -n . escapeshellarg($test_file), $desc, $pipes);
var_dump($proc);
if (!$proc) {
exit(1);
}
$client_socket = stream_socket_client('unix://' . $socket_file);
var_dump($client_socket);
echo stream_get_contents($client_socket);
fclose($client_socket);
proc_terminate($proc);
proc_close($proc);
unlink($socket_file);
?
--EXPECTF--
resource(%d) of type (stream)
resource(%d) of type (process)
resource(%d) of type (stream)
resource(%d) of type (stream)
resource(%d) of type (stream)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/022.inc?view=markuprev=1.1
Index: php-src/sapi/cli/tests/022.inc
+++ php-src/sapi/cli/tests/022.inc
?php
ob_start();
var_dump(STDIN);
$fd = fopen(php://stdin,r);
var_dump($fd);
$client_socket = stream_socket_accept($fd);
$data = ob_get_clean();
fwrite($client_socket, $data);
?
--
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 php_fopen_wrapper.c /sapi/cli/tests 022.inc 022.phpt
lbarnaudTue Nov 4 21:05:55 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/sapi/cli/tests 022.phpt 022.inc
Modified files:
/php-src/ext/standard php_fopen_wrapper.c
Log:
MFH: Open STDIN and php://stdin streams with the relevant
wrapper when the file descriptor is a socket (inetd, etc)
Fixes bug #43731
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_fopen_wrapper.c?r1=1.45.2.4.2.9r2=1.45.2.4.2.10diff_format=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.9
php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.10
--- php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.9 Mon Dec 31
07:20:13 2007
+++ php-src/ext/standard/php_fopen_wrapper.cTue Nov 4 21:05:55 2008
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.45.2.4.2.9 2007/12/31 07:20:13 sebastian Exp $
*/
+/* $Id: php_fopen_wrapper.c,v 1.45.2.4.2.10 2008/11/04 21:05:55 lbarnaud Exp $
*/
#include stdio.h
#include stdlib.h
@@ -290,9 +290,23 @@
return NULL;
}
+#if defined(S_IFSOCK) !defined(WIN32) !defined(__BEOS__)
+ do {
+ struct stat st;
+ memset(st, 0, sizeof(st));
+ if (fstat(fd, st) == 0 (st.st_mode S_IFMT) == S_IFSOCK) {
+ stream = php_stream_sock_open_from_socket(fd, NULL);
+ if (stream) {
+ stream-ops = php_stream_socket_ops;
+ return stream;
+ }
+ }
+ } while (0);
+#endif
+
if (file) {
stream = php_stream_fopen_from_file(file, mode);
- } else {
+ } else {
stream = php_stream_fopen_from_fd(fd, mode, NULL);
if (stream == NULL) {
close(fd);
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/022.phpt?view=markuprev=1.1
Index: php-src/sapi/cli/tests/022.phpt
+++ php-src/sapi/cli/tests/022.phpt
--TEST--
STDIN/OUT/ERR stream type
--SKIPIF--
?php
if (!getenv(TEST_PHP_EXECUTABLE)) die(skip TEST_PHP_EXECUTABLE not set);
if (substr(PHP_OS, 0, 3) == WIN) die(skip non windows test);
?
--FILE--
?php
$php = getenv(TEST_PHP_EXECUTABLE);
$socket_file = dirname(__FILE__) . '/' . pathinfo(__FILE__, PATHINFO_FILENAME)
. '.sock';
$test_file = dirname(__FILE__) . '/' . pathinfo(__FILE__, PATHINFO_FILENAME) .
'.inc';
if (file_exists($socket_file)) {
unlink($socket_file);
}
$socket = stream_socket_server('unix://' . $socket_file);
var_dump($socket);
if (!$socket) {
exit(1);
}
$desc = array(
0 = $socket,
1 = STDOUT,
2 = STDERR,
);
$pipes = array();
$proc = proc_open($php -n . escapeshellarg($test_file), $desc, $pipes);
var_dump($proc);
if (!$proc) {
exit(1);
}
$client_socket = stream_socket_client('unix://' . $socket_file);
var_dump($client_socket);
echo stream_get_contents($client_socket);
fclose($client_socket);
proc_terminate($proc);
proc_close($proc);
unlink($socket_file);
?
--EXPECTF--
resource(%d) of type (stream)
resource(%d) of type (process)
resource(%d) of type (stream)
resource(%d) of type (stream)
resource(%d) of type (stream)
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/022.inc?view=markuprev=1.1
Index: php-src/sapi/cli/tests/022.inc
+++ php-src/sapi/cli/tests/022.inc
?php
ob_start();
var_dump(STDIN);
$fd = fopen(php://stdin,r);
var_dump($fd);
$client_socket = stream_socket_accept($fd);
$data = ob_get_clean();
fwrite($client_socket, $data);
?
--
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
lbarnaudTue Nov 4 21:07:45 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1302r2=1.2027.2.547.2.1303diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1302 php-src/NEWS:1.2027.2.547.2.1303 --- php-src/NEWS:1.2027.2.547.2.1302Tue Nov 4 17:07:20 2008 +++ php-src/NEWSTue Nov 4 21:07:44 2008 @@ -32,6 +32,8 @@ in the stream content). (Arnaud) - Fixed bug #44327 (PDORow::queryString property numeric offsets / Crash). (Felipe) +- Fixed bug #43731 (socket_getpeername: cannot use on stdin with inetd). + (Arnaud) - Fixed bug #43452 (strings containing a weekday, or a number plus weekday behaved incorrect of the current day-of-week was the same as the one in the phrase).(Derick) -- 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 config.m4 util.c
Hello Steph, Tuesday, November 4, 2008, 1:12:32 PM, you wrote: Hi Marcus, I'm pretty sure this is a wrong fix - the check for not shared replaces the original check for HAVE_HASH_EXT, which is effectively a global equivalent to $PHP_HASH. So it should be something like: if test $PHP_HASH != no; then if test $PHP_HASH_SHARED != yes; then AC_DEFINE(PHAR_HASH_OK,1,[ ]) else AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) fi fi As far as I can tell that acomplishes the same. Onlz zou changed the original logic a lot rather then trzing to keep as much of it as possible. The ext/hash files are already included as appropriate in phar_internal.h and don't/shouldn't need re-including anywhere else. Doesnät matter. This helps me figuring out what is wrong. Also - it looks like ext/hash needs adding to phar_deps in phar.c (as ZEND_MOD_OPTIONAL). Zep, that's a good point. And config.w32 needs updating to define PHAR_HASH_OK, since there'll be zero hash support under doze otherwise. HAVE_HASH_EXT is at least automatic...! Since I cannot test on windows I need windows developers like zou to fix it. - Steph - Original Message - From: Marcus Boerger [EMAIL PROTECTED] To: php-cvs@lists.php.net Sent: Tuesday, November 04, 2008 1:27 AM Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar config.m4 util.c helly Tue Nov 4 01:27:52 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.m4 util.c Log: - MFH Fix dependency from Phar to hash http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.7r2=1.27.2.8diff_format=u Index: php-src/ext/phar/config.m4 diff -u php-src/ext/phar/config.m4:1.27.2.7 php-src/ext/phar/config.m4:1.27.2.8 --- php-src/ext/phar/config.m4:1.27.2.7 Thu Oct 9 00:50:46 2008 +++ php-src/ext/phar/config.m4 Tue Nov 4 01:27:52 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.27.2.7 2008/10/09 00:50:46 cellog Exp $ +dnl $Id: config.m4,v 1.27.2.8 2008/11/04 01:27:52 helly Exp $ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, @@ -8,7 +8,9 @@ PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) AC_MSG_CHECKING([for phar openssl support]) if test $PHP_HASH_SHARED != yes; then -AC_DEFINE(PHAR_HASH_OK,1,[ ]) +if test $PHP_HASH != no; then + AC_DEFINE(PHAR_HASH_OK,1,[ ]) +fi else AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) fi @@ -22,6 +24,7 @@ AC_MSG_RESULT([no]) fi fi + PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT fi http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.39r2=1.55.2.40diff_format=u Index: php-src/ext/phar/util.c diff -u php-src/ext/phar/util.c:1.55.2.39 php-src/ext/phar/util.c:1.55.2.40 --- php-src/ext/phar/util.c:1.55.2.39 Sun Oct 26 05:49:09 2008 +++ php-src/ext/phar/util.c Tue Nov 4 01:27:52 2008 @@ -18,9 +18,12 @@ +--+ */ -/* $Id: util.c,v 1.55.2.39 2008/10/26 05:49:09 cellog Exp $ */ +/* $Id: util.c,v 1.55.2.40 2008/11/04 01:27:52 helly Exp $ */ #include phar_internal.h +#ifdef PHAR_HASH_OK +#include ext/hash/php_hash_sha.h +#endif #ifdef PHAR_HAVE_OPENSSL /* OpenSSL includes */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php Best regards, Marcus -- 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) /pear install-pear.txt
saltybeagle Tue Nov 4 21:25:22 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/pear install-pear.txt Log: Test - if this works, something is wrong. http://cvs.php.net/viewvc.cgi/php-src/pear/install-pear.txt?r1=1.2.6.1.4.1r2=1.2.6.1.4.2diff_format=u Index: php-src/pear/install-pear.txt diff -u php-src/pear/install-pear.txt:1.2.6.1.4.1 php-src/pear/install-pear.txt:1.2.6.1.4.2 --- php-src/pear/install-pear.txt:1.2.6.1.4.1 Sat May 24 01:30:48 2008 +++ php-src/pear/install-pear.txt Tue Nov 4 21:25:22 2008 @@ -1,6 +1,6 @@ +--+ -| The installation process is incomplete. The following resources were | -| not installed: | +| The installation process is not complete. The following resources| +| were not installed: | | | | PEAR: PHP Extension and Application Repository | | | -- 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/gd gd.c
On 04.11.2008 23:25, Pierre-Alain Joye wrote: pajoyeTue Nov 4 20:25:45 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - MFH: add png and jpeg version info + php_info_print_table_row(2, libPNG Version, PNG_LIBPNG_VER_STRING); This breaks the build. /local/qa/5_3/ext/gd/gd.c: In function 'zm_info_gd': /local/qa/5_3/ext/gd/gd.c:1406: error: 'PNG_LIBPNG_VER_STRING' undeclared (first use in this function) /local/qa/5_3/ext/gd/gd.c:1406: error: (Each undeclared identifier is reported only once /local/qa/5_3/ext/gd/gd.c:1406: error: for each function it appears in.) make: *** [ext/gd/gd.lo] Error 1 png.h is NOT really included in gd.c because HAVE_GD_PNG gets defined only after #include php.h (I'm building it statically, so there's not config.h). Moving png.h and jpeglib.h a few lines down seems to help. -- 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/msql .cvsignore CREDITS config.m4 config.w32 msql.dsp php_msql.c php_msql.h
lsmith Tue Nov 4 22:22:37 2008 UTC Removed files: /php-src/ext/msql config.w32 php_msql.h msql.dsp .cvsignore CREDITS php_msql.c config.m4 Log: ext/msql has been moved from php-src to PECL adhead of PHP 5.3 -- 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/msql .cvsignore CREDITS config.m4 config.w32 msql.dsp php_msql.c php_msql.h
lsmith Tue Nov 4 22:22:44 2008 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/msql .cvsignore php_msql.h config.w32 CREDITS msql.dsp config.m4 php_msql.c Log: MFH -- 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
lsmith Tue Nov 4 22:31:48 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: ext/msql is now in PECL starting alpha3 [DOC] http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.361r2=1.2027.2.547.2.965.2.362diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.361 php-src/NEWS:1.2027.2.547.2.965.2.362 --- php-src/NEWS:1.2027.2.547.2.965.2.361 Tue Nov 4 15:58:49 2008 +++ php-src/NEWSTue Nov 4 22:31:48 2008 @@ -4,7 +4,7 @@ - Upgraded bundled PCRE to version 7.8. (Nuno) - Upgraded bundled sqlite to version 3.6.2. (Scott) -- Changed error level E_ERROR into E_WARNING in Soap extension methods +- Changed error level E_ERROR into E_WARNING in Soap extension methods parameter validation. (Felipe) - Changed openssl info to show the shared library version number. (Scott) @@ -61,6 +61,8 @@ - Fixed bug #44575 (parse_ini_file comment # line problems). (Arnaud) - Fixed bug #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS). (Johannes, chx1975 at gmail dot com) +- Moved ext/msql extension to PECL (Derick/Lukas): + 02 Sep 2008, PHP 5.3.0 Alpha 2 - Removed special treatment of /tmp in sessions for open_basedir. @@ -100,7 +102,7 @@ - Fixed bug #45763 (mysqli::multi_query does not work with mysqlnd). (Johannes) - Fixed bug #45757 (FreeBSD4.11 build failure: failed include; stdint.h). (Hannes) -- Fixed bug #45743 (property_exists fails to find static protected member in +- Fixed bug #45743 (property_exists fails to find static protected member in child class). (Felipe) - Fixed bug #45717 (Fileinfo/libmagic build fails, missing err.h and getopt.h). (Derick) @@ -112,10 +114,10 @@ (Derick) - Fixed bug #45447 (Filesystem time functions on Vista and server 2008). (Pierre) -- Fixed bug #45384 (parse_ini_file will result in parse error with no trailing +- Fixed bug #45384 (parse_ini_file will result in parse error with no trailing newline). (Arnaud) - Fixed bug #45044 (relative paths not resolved correctly). (Dmitry) -- Fixed bug #44842 (parse_ini_file keys that start/end with underscore). +- Fixed bug #44842 (parse_ini_file keys that start/end with underscore). (Arnaud) - Fixed bug #44100 (Inconsistent handling of static array declarations with duplicate keys). (Dmitry) @@ -266,7 +268,7 @@ . Added access to internal values of DSA, RSA and DH keys. (Dmitry) . Fixed a memory leak on openssl_decrypt(). (Henrique) . Fixed segfault caused by openssl_pkey_new(). (Henrique) - . Fixed bug caused by uninitilized variables in openssl_pkcs7_encrypt() and + . Fixed bug caused by uninitilized variables in openssl_pkcs7_encrypt() and openssl_pkcs7_sign(). (Henrique) . Fixed error message in openssl_seal(). (Henrique) @@ -307,8 +309,8 @@ - Improved crypt() function: (Pierre) . Added Blowfish and extended DES support. (Using Blowfish implementation from Solar Designer). - . Made crypt features portable by providing our own implementations -for crypt_r and the algorithms which are used when OS does not provide + . Made crypt features portable by providing our own implementations +for crypt_r and the algorithms which are used when OS does not provide them. PHP implementations are always used for Windows builds. - Added new extensions: @@ -415,7 +417,7 @@ - Fixed bug #45179 (--with-mysql-sock fails to compile work). (Andrey) - Fixed bug #45038 (Crash when using DateTimeZone object returned by Date::getTimezone). (Joe Orton, Derick) -- Fixed bug #45030 (Destination image alpha channel noise when using +- Fixed bug #45030 (Destination image alpha channel noise when using imagecopyresampled). (Pierre) - Fixed bug #44769 (declaring private magic methods should throw error). (Felipe) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.RELEASE_PROCESS
lsmith Tue Nov 4 23:00:18 2008 UTC Modified files: /php-srcREADME.RELEASE_PROCESS Log: added note about running scripts/dev/credits http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.11r2=1.12diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.11 php-src/README.RELEASE_PROCESS:1.12 --- php-src/README.RELEASE_PROCESS:1.11 Wed Sep 3 17:08:00 2008 +++ php-src/README.RELEASE_PROCESS Tue Nov 4 23:00:18 2008 @@ -48,33 +48,36 @@ 3. Commit those changes -4. tag the repository with the version f.e. ``cvs tag php_4_4_1RC1`` +4. run the scripts/dev/credits script in php-src and commit the changes in the +credits files in ext/standard. + +5. tag the repository with the version f.e. ``cvs tag php_4_4_1RC1`` (of course, you need to change that to the version you're rolling an RC for). -5. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` +6. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS`` again, to the **next** version. F.e. if the release candidate was 4.4.1RC1 then the new one should be 4.4.1RC2-dev - regardless if we get a new RC or not. This is to make sure ``version_compare()`` can correctly work. -6. Commit those changes +7. Commit those changes -7. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4 +8. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4 branch if you're rolling 4.4.x releases). -8. You do not have to update the tree, but of course you can with ``cvs up -dP``. +9. You do not have to update the tree, but of course you can with ``cvs up -dP``. -9. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure +10. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure and build two tarballs (one gz and one bz2). -10. Copy those two tarballs to www.php.net, in your homedir their should be a +11. Copy those two tarballs to www.php.net, in your homedir their should be a directory downloads/. Copy them into there, so that the system can generate MD5 sums. If you do not have this directory, talk to Derick. -11. Now the RC can be found on http://downloads.php.net/yourname, +12. Now the RC can be found on http://downloads.php.net/yourname, f.e. http://downloads.php.net/derick/ -12. Once the release has been tagged, contact the PHP Windows development team +13. Once the release has been tagged, contact the PHP Windows development team ([EMAIL PROTECTED]) so that Windows binaries can be created. Once those are made, they should be placed into the same directory as the source snapshots. @@ -137,34 +140,37 @@ 4. Commit those changes -5. tag the repository with the version f.e. ``cvs tag php_4_4_1`` +5. run the scripts/dev/credits script in php-src and commit the changes in the +credits files in ext/standard. + +6. tag the repository with the version f.e. ``cvs tag php_4_4_1`` (of course, you need to change that to the version you're rolling an RC for). When making 5.X release, you need to tag the Zend directory separately!! -6. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and +7. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS`` again, to the **next** version. F.e. if the release candidate was 4.4.1RC1 then the new one should be 4.4.1RC2-dev - regardless if we get a new RC or not. This is to make sure ``version_compare()`` can correctly work. -7. Commit those changes +8. Commit those changes -8. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4 +9. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4 branch if you're rolling 4.4.x releases). -9. You do not have to update the tree, but of course you can with ``cvs up -dP``. +10. You do not have to update the tree, but of course you can with ``cvs up -dP``. -10. run: ``./makedist php 4.4.1``, this will export the tree, create configure +11. run: ``./makedist php 4.4.1``, this will export the tree, create configure and build two tarballs (one gz and one bz2). -11. Commit those two tarballs to CVS (phpweb/distributions) +12. Commit those two tarballs to CVS (phpweb/distributions) -12. Once the release has been tagged, contact the PHP Windows development team +13. Once the release has been tagged, contact the PHP Windows development team ([EMAIL PROTECTED]) so that Windows binaries can be created. Once those are made, they should be committed to CVS too. -13. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4) +14. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4) -14. When making a final release, also remind the PHP Windows development team +15. When making a final release, also remind the PHP Windows development team ([EMAIL PROTECTED])
[PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS
lsmith Tue Nov 4 23:00:58 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.RELEASE_PROCESS Log: MFH http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.1.2.11r2=1.1.2.12diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.1.2.11 php-src/README.RELEASE_PROCESS:1.1.2.12 --- php-src/README.RELEASE_PROCESS:1.1.2.11 Wed Sep 3 17:08:05 2008 +++ php-src/README.RELEASE_PROCESS Tue Nov 4 23:00:57 2008 @@ -48,33 +48,36 @@ 3. Commit those changes -4. tag the repository with the version f.e. ``cvs tag php_4_4_1RC1`` +4. run the scripts/dev/credits script in php-src and commit the changes in the +credits files in ext/standard. + +5. tag the repository with the version f.e. ``cvs tag php_4_4_1RC1`` (of course, you need to change that to the version you're rolling an RC for). -5. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` +6. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS`` again, to the **next** version. F.e. if the release candidate was 4.4.1RC1 then the new one should be 4.4.1RC2-dev - regardless if we get a new RC or not. This is to make sure ``version_compare()`` can correctly work. -6. Commit those changes +7. Commit those changes -7. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4 +8. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4 branch if you're rolling 4.4.x releases). -8. You do not have to update the tree, but of course you can with ``cvs up -dP``. +9. You do not have to update the tree, but of course you can with ``cvs up -dP``. -9. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure +10. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure and build two tarballs (one gz and one bz2). -10. Copy those two tarballs to www.php.net, in your homedir their should be a +11. Copy those two tarballs to www.php.net, in your homedir their should be a directory downloads/. Copy them into there, so that the system can generate MD5 sums. If you do not have this directory, talk to Derick. -11. Now the RC can be found on http://downloads.php.net/yourname, +12. Now the RC can be found on http://downloads.php.net/yourname, f.e. http://downloads.php.net/derick/ -12. Once the release has been tagged, contact the PHP Windows development team +13. Once the release has been tagged, contact the PHP Windows development team ([EMAIL PROTECTED]) so that Windows binaries can be created. Once those are made, they should be placed into the same directory as the source snapshots. @@ -137,34 +140,37 @@ 4. Commit those changes -5. tag the repository with the version f.e. ``cvs tag php_4_4_1`` +5. run the scripts/dev/credits script in php-src and commit the changes in the +credits files in ext/standard. + +6. tag the repository with the version f.e. ``cvs tag php_4_4_1`` (of course, you need to change that to the version you're rolling an RC for). When making 5.X release, you need to tag the Zend directory separately!! -6. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and +7. Bump up the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS`` again, to the **next** version. F.e. if the release candidate was 4.4.1RC1 then the new one should be 4.4.1RC2-dev - regardless if we get a new RC or not. This is to make sure ``version_compare()`` can correctly work. -7. Commit those changes +8. Commit those changes -8. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4 +9. Log in onto the snaps box and go into the correct tree (f.e. the PHP_4_4 branch if you're rolling 4.4.x releases). -9. You do not have to update the tree, but of course you can with ``cvs up -dP``. +10. You do not have to update the tree, but of course you can with ``cvs up -dP``. -10. run: ``./makedist php 4.4.1``, this will export the tree, create configure +11. run: ``./makedist php 4.4.1``, this will export the tree, create configure and build two tarballs (one gz and one bz2). -11. Commit those two tarballs to CVS (phpweb/distributions) +12. Commit those two tarballs to CVS (phpweb/distributions) -12. Once the release has been tagged, contact the PHP Windows development team +13. Once the release has been tagged, contact the PHP Windows development team ([EMAIL PROTECTED]) so that Windows binaries can be created. Once those are made, they should be committed to CVS too. -13. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4) +14. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4) -14. When making a final release, also remind the PHP Windows development team +15. When making a final release, also remind the PHP Windows development team ([EMAIL PROTECTED])
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
lsmith Tue Nov 4 23:01:13 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: fixed ext/msql NEWS entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.362r2=1.2027.2.547.2.965.2.363diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.362 php-src/NEWS:1.2027.2.547.2.965.2.363 --- php-src/NEWS:1.2027.2.547.2.965.2.362 Tue Nov 4 22:31:48 2008 +++ php-src/NEWSTue Nov 4 23:01:13 2008 @@ -4,6 +4,8 @@ - Upgraded bundled PCRE to version 7.8. (Nuno) - Upgraded bundled sqlite to version 3.6.2. (Scott) +- Moved ext/msql to PECL. (Derick, Lukas) + - Changed error level E_ERROR into E_WARNING in Soap extension methods parameter validation. (Felipe) - Changed openssl info to show the shared library version number. (Scott) @@ -61,7 +63,6 @@ - Fixed bug #44575 (parse_ini_file comment # line problems). (Arnaud) - Fixed bug #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS). (Johannes, chx1975 at gmail dot com) -- Moved ext/msql extension to PECL (Derick/Lukas): 02 Sep 2008, PHP 5.3.0 Alpha 2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / README.RELEASE_PROCESS
lsmith Wed Nov 5 07:25:12 2008 UTC Modified files: /php-srcREADME.RELEASE_PROCESS Log: typo fix (thx chris jones for spotting) http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.12r2=1.13diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.12 php-src/README.RELEASE_PROCESS:1.13 --- php-src/README.RELEASE_PROCESS:1.12 Tue Nov 4 23:00:18 2008 +++ php-src/README.RELEASE_PROCESS Wed Nov 5 07:25:12 2008 @@ -70,7 +70,7 @@ 10. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure and build two tarballs (one gz and one bz2). -11. Copy those two tarballs to www.php.net, in your homedir their should be a +11. Copy those two tarballs to www.php.net, in your homedir there should be a directory downloads/. Copy them into there, so that the system can generate MD5 sums. If you do not have this directory, talk to Derick. -- 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) / README.RELEASE_PROCESS
lsmith Wed Nov 5 07:25:18 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.RELEASE_PROCESS Log: MFH http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.1.2.12r2=1.1.2.13diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.1.2.12 php-src/README.RELEASE_PROCESS:1.1.2.13 --- php-src/README.RELEASE_PROCESS:1.1.2.12 Tue Nov 4 23:00:57 2008 +++ php-src/README.RELEASE_PROCESS Wed Nov 5 07:25:18 2008 @@ -70,7 +70,7 @@ 10. run: ``./makedist php 4.4.1RC1``, this will export the tree, create configure and build two tarballs (one gz and one bz2). -11. Copy those two tarballs to www.php.net, in your homedir their should be a +11. Copy those two tarballs to www.php.net, in your homedir there should be a directory downloads/. Copy them into there, so that the system can generate MD5 sums. If you do not have this directory, talk to Derick. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
