[PHP-CVS] cvs: CVSROOT / avail
philip Wed Jul 1 03:08:46 2009 UTC Modified files: /CVSROOTavail Log: give self qaweb karma to commit fixes http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1541&r2=1.1542&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1541 CVSROOT/avail:1.1542 --- CVSROOT/avail:1.1541Mon Jun 29 09:03:25 2009 +++ CVSROOT/avail Wed Jul 1 03:08:45 2009 @@ -55,7 +55,7 @@ # The PHP Quality Assurance Team maintains their own website. -avail|ericstewart,scottmac,ilia,jalal,zak,andre,lyric,jmoore,ronabop,sebastian,joey,jani,torben,hellekin,cnewbill,bate,yohgaki,jan,imajes,derick,msopacua,nohn,edink,iliaa,helly,sean,nlopess,tony2001,zoe,johannes,lsmith,stevseea,felixdv,bjori,pajoye|qaweb +avail|ericstewart,scottmac,ilia,jalal,zak,andre,lyric,jmoore,ronabop,sebastian,joey,jani,torben,hellekin,cnewbill,bate,yohgaki,jan,imajes,derick,msopacua,nohn,edink,iliaa,helly,sean,nlopess,tony2001,zoe,johannes,lsmith,stevseea,felixdv,bjori,pajoye,philip|qaweb # Some people get only access to specific languages for phpdoc avail|diab,daif,salehcoder|phpdoc-ar -- 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/tests jpeg2wbmp_error1.phpt jpeg2wbmp_error2.phpt jpeg2wbmp_error3.phpt png2wbmp_error1.phpt png2wbmp_error2.phpt png2wbmp_error3.phpt
felipe Wed Jul 1 02:32:55 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd/tests jpeg2wbmp_error1.phpt jpeg2wbmp_error2.phpt jpeg2wbmp_error3.phpt png2wbmp_error1.phpt png2wbmp_error2.phpt png2wbmp_error3.phpt Log: - Fixed tests http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/jpeg2wbmp_error1.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/gd/tests/jpeg2wbmp_error1.phpt diff -u php-src/ext/gd/tests/jpeg2wbmp_error1.phpt:1.1.2.2 php-src/ext/gd/tests/jpeg2wbmp_error1.phpt:1.1.2.3 --- php-src/ext/gd/tests/jpeg2wbmp_error1.phpt:1.1.2.2 Wed Jul 1 00:56:01 2009 +++ php-src/ext/gd/tests/jpeg2wbmp_error1.phpt Wed Jul 1 02:32:55 2009 @@ -19,14 +19,17 @@ $text_color = imagecolorallocate($im, 255, 255, 255); imagestring($im, 1, 5, 5, 'A Simple Text String', $text_color); +$file = dirname(__FILE__) .'/simpletext.jpg'; +$file2 = dirname(__FILE__) .'/simpletext.wbmp'; + // Save the image as 'simpletext.jpg' -imagejpeg($im, 'simpletext.jpg'); +imagejpeg($im, $file); // Free up memory imagedestroy($im); -jpeg2wbmp('simpletext.jpg', 'simpletext.wbmp', 20, 120, 9); -jpeg2wbmp('simpletext.jpg', 'simpletext.wbmp', 20, 120, -1); +jpeg2wbmp($file, $file2, 20, 120, 9); +jpeg2wbmp($file', $file2, 20, 120, -1); ?> --EXPECTF-- Warning: jpeg2wbmp(): Invalid threshold value '9' in %s on line %d @@ -34,5 +37,6 @@ Warning: jpeg2wbmp(): Invalid threshold value '-1' in %s on line %d --CLEAN-- \ No newline at end of file +unlink(dirname(__FILE__) .'/simpletext.jpg'); +unlink(dirname(__FILE__) .'/simpletext.wbmp'); +?> http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/jpeg2wbmp_error2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/gd/tests/jpeg2wbmp_error2.phpt diff -u php-src/ext/gd/tests/jpeg2wbmp_error2.phpt:1.1.2.2 php-src/ext/gd/tests/jpeg2wbmp_error2.phpt:1.1.2.3 --- php-src/ext/gd/tests/jpeg2wbmp_error2.phpt:1.1.2.2 Wed Jul 1 00:56:01 2009 +++ php-src/ext/gd/tests/jpeg2wbmp_error2.phpt Wed Jul 1 02:32:55 2009 @@ -14,9 +14,10 @@ ?> --FILE-- --EXPECTF-- Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d @@ -26,5 +27,5 @@ Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d --CLEAN-- \ No newline at end of file +unlink(dirname(__FILE__) .'/simpletext.wbmp'); +?> http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/jpeg2wbmp_error3.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/gd/tests/jpeg2wbmp_error3.phpt diff -u php-src/ext/gd/tests/jpeg2wbmp_error3.phpt:1.1.2.2 php-src/ext/gd/tests/jpeg2wbmp_error3.phpt:1.1.2.3 --- php-src/ext/gd/tests/jpeg2wbmp_error3.phpt:1.1.2.2 Wed Jul 1 00:56:01 2009 +++ php-src/ext/gd/tests/jpeg2wbmp_error3.phpt Wed Jul 1 02:32:55 2009 @@ -19,15 +19,17 @@ $text_color = imagecolorallocate($im, 255, 255, 255); imagestring($im, 1, 5, 5, 'A Simple Text String', $text_color); +$file = dirname(__FILE__) .'/simpletext.jpg'; + // Save the image as 'simpletext.jpg' -imagejpeg($im, 'simpletext.jpg'); +imagejpeg($im, $file); // Free up memory imagedestroy($im); -jpeg2wbmp('simpletext.jpg', '', 20, 120, 8); -jpeg2wbmp('simpletext.jpg', null, 20, 120, 8); -jpeg2wbmp('simpletext.jpg', false, 20, 120, 8); +jpeg2wbmp($file, '', 20, 120, 8); +jpeg2wbmp($file, null, 20, 120, 8); +jpeg2wbmp($file, false, 20, 120, 8); ?> --EXPECTF-- Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d @@ -37,5 +39,5 @@ Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d --CLEAN-- \ No newline at end of file +unlink(dirname(__FILE__) .'/simpletext.jpg'); +?> http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/png2wbmp_error1.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/gd/tests/png2wbmp_error1.phpt diff -u php-src/ext/gd/tests/png2wbmp_error1.phpt:1.1.2.2 php-src/ext/gd/tests/png2wbmp_error1.phpt:1.1.2.3 --- php-src/ext/gd/tests/png2wbmp_error1.phpt:1.1.2.2 Wed Jul 1 00:56:01 2009 +++ php-src/ext/gd/tests/png2wbmp_error1.phpt Wed Jul 1 02:32:55 2009 @@ -19,14 +19,17 @@ $text_color = imagecolorallocate($im, 255, 255, 255); imagestring($im, 1, 5, 5, 'A Simple Text String', $text_color); +$file = dirname(__FILE__) .'/simpletext.png'; +$file2 = dirname(__FILE__) .'/simpletext.wbmp'; + // Save the image as 'simpletext.png' -imagepng($im, 'simpletext.png'); +imagepng($im, $file); // Free up memory imagedestroy($im); -png2wbmp('simpletext.png', 'simpletext.wbmp', 20, 120, 9); -png2wbmp('simpletext.png', 'simpletext.wbmp', 20, 120, -1); +png2wbmp($file, $file2, 20, 120, 9); +png2wbmp($file, $file2, 20, 120, -1); ?> --EXPECTF-- Warning: png2wbmp(): Invalid threshold value '9' in %s on line %d @@ -34,5 +37,6 @@ Warning: png2wbmp(): Invalid threshold value '-1' in %s on line %d --CLEAN-- \ No newline at end of file +unlink(dirname(__FILE__) .'/simpletext.png'); +unlink(dirname(__FILE__) .'/simpletext.wbmp'); +?> http://cvs.php.net/vi
[PHP-CVS] cvs: php-src /ext/gd/tests jpeg2wbmp_error1.phpt jpeg2wbmp_error2.phpt jpeg2wbmp_error3.phpt png2wbmp_error1.phpt png2wbmp_error2.phpt png2wbmp_error3.phpt
felipe Wed Jul 1 02:32:10 2009 UTC Modified files: /php-src/ext/gd/tests jpeg2wbmp_error1.phpt jpeg2wbmp_error2.phpt jpeg2wbmp_error3.phpt png2wbmp_error1.phpt png2wbmp_error2.phpt png2wbmp_error3.phpt Log: - Fixed tests http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/jpeg2wbmp_error1.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/gd/tests/jpeg2wbmp_error1.phpt diff -u php-src/ext/gd/tests/jpeg2wbmp_error1.phpt:1.1 php-src/ext/gd/tests/jpeg2wbmp_error1.phpt:1.2 --- php-src/ext/gd/tests/jpeg2wbmp_error1.phpt:1.1 Wed Jul 1 00:51:26 2009 +++ php-src/ext/gd/tests/jpeg2wbmp_error1.phpt Wed Jul 1 02:32:10 2009 @@ -19,14 +19,17 @@ $text_color = imagecolorallocate($im, 255, 255, 255); imagestring($im, 1, 5, 5, 'A Simple Text String', $text_color); +$file = dirname(__FILE__) .'/simpletext.jpg'; +$file2 = dirname(__FILE__) .'/simpletext.wbmp'; + // Save the image as 'simpletext.jpg' -imagejpeg($im, 'simpletext.jpg'); +imagejpeg($im, $file); // Free up memory imagedestroy($im); -jpeg2wbmp('simpletext.jpg', 'simpletext.wbmp', 20, 120, 9); -jpeg2wbmp('simpletext.jpg', 'simpletext.wbmp', 20, 120, -1); +jpeg2wbmp($file, $file2, 20, 120, 9); +jpeg2wbmp($file', $file2, 20, 120, -1); ?> --EXPECTF-- Warning: jpeg2wbmp(): Invalid threshold value '9' in %s on line %d @@ -34,5 +37,6 @@ Warning: jpeg2wbmp(): Invalid threshold value '-1' in %s on line %d --CLEAN-- \ No newline at end of file +unlink(dirname(__FILE__) .'/simpletext.jpg'); +unlink(dirname(__FILE__) .'/simpletext.wbmp'); +?> http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/jpeg2wbmp_error2.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/gd/tests/jpeg2wbmp_error2.phpt diff -u php-src/ext/gd/tests/jpeg2wbmp_error2.phpt:1.1 php-src/ext/gd/tests/jpeg2wbmp_error2.phpt:1.2 --- php-src/ext/gd/tests/jpeg2wbmp_error2.phpt:1.1 Wed Jul 1 00:51:26 2009 +++ php-src/ext/gd/tests/jpeg2wbmp_error2.phpt Wed Jul 1 02:32:10 2009 @@ -14,9 +14,10 @@ ?> --FILE-- --EXPECTF-- Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d @@ -26,5 +27,5 @@ Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d --CLEAN-- \ No newline at end of file +unlink(dirname(__FILE__) .'/simpletext.wbmp'); +?> http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/jpeg2wbmp_error3.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/gd/tests/jpeg2wbmp_error3.phpt diff -u php-src/ext/gd/tests/jpeg2wbmp_error3.phpt:1.1 php-src/ext/gd/tests/jpeg2wbmp_error3.phpt:1.2 --- php-src/ext/gd/tests/jpeg2wbmp_error3.phpt:1.1 Wed Jul 1 00:51:26 2009 +++ php-src/ext/gd/tests/jpeg2wbmp_error3.phpt Wed Jul 1 02:32:10 2009 @@ -19,15 +19,17 @@ $text_color = imagecolorallocate($im, 255, 255, 255); imagestring($im, 1, 5, 5, 'A Simple Text String', $text_color); +$file = dirname(__FILE__) .'/simpletext.jpg'; + // Save the image as 'simpletext.jpg' -imagejpeg($im, 'simpletext.jpg'); +imagejpeg($im, $file); // Free up memory imagedestroy($im); -jpeg2wbmp('simpletext.jpg', '', 20, 120, 8); -jpeg2wbmp('simpletext.jpg', null, 20, 120, 8); -jpeg2wbmp('simpletext.jpg', false, 20, 120, 8); +jpeg2wbmp($file, '', 20, 120, 8); +jpeg2wbmp($file, null, 20, 120, 8); +jpeg2wbmp($file, false, 20, 120, 8); ?> --EXPECTF-- Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d @@ -37,5 +39,5 @@ Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d --CLEAN-- \ No newline at end of file +unlink(dirname(__FILE__) .'/simpletext.jpg'); +?> http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/png2wbmp_error1.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/gd/tests/png2wbmp_error1.phpt diff -u php-src/ext/gd/tests/png2wbmp_error1.phpt:1.1 php-src/ext/gd/tests/png2wbmp_error1.phpt:1.2 --- php-src/ext/gd/tests/png2wbmp_error1.phpt:1.1 Wed Jul 1 00:51:26 2009 +++ php-src/ext/gd/tests/png2wbmp_error1.phpt Wed Jul 1 02:32:10 2009 @@ -19,14 +19,17 @@ $text_color = imagecolorallocate($im, 255, 255, 255); imagestring($im, 1, 5, 5, 'A Simple Text String', $text_color); +$file = dirname(__FILE__) .'/simpletext.png'; +$file2 = dirname(__FILE__) .'/simpletext.wbmp'; + // Save the image as 'simpletext.png' -imagepng($im, 'simpletext.png'); +imagepng($im, $file); // Free up memory imagedestroy($im); -png2wbmp('simpletext.png', 'simpletext.wbmp', 20, 120, 9); -png2wbmp('simpletext.png', 'simpletext.wbmp', 20, 120, -1); +png2wbmp($file, $file2, 20, 120, 9); +png2wbmp($file, $file2, 20, 120, -1); ?> --EXPECTF-- Warning: png2wbmp(): Invalid threshold value '9' in %s on line %d @@ -34,5 +37,6 @@ Warning: png2wbmp(): Invalid threshold value '-1' in %s on line %d --CLEAN-- \ No newline at end of file +unlink(dirname(__FILE__) .'/simpletext.png'); +unlink(dirname(__FILE__) .'/simpletext.wbmp'); +?> http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/png2wbmp_error2.phpt?r1=1.1&r2=1.2&diff_format=u In
[PHP-CVS] cvs: phpruntests /phpt-tests sample_postraw.phpt
zoe Tue Jun 30 19:43:03 2009 UTC Modified files: /phpruntests/phpt-tests sample_postraw.phpt Log: fixing finally http://cvs.php.net/viewvc.cgi/phpruntests/phpt-tests/sample_postraw.phpt?r1=1.2&r2=1.3&diff_format=u Index: phpruntests/phpt-tests/sample_postraw.phpt diff -u phpruntests/phpt-tests/sample_postraw.phpt:1.2 phpruntests/phpt-tests/sample_postraw.phpt:1.3 --- phpruntests/phpt-tests/sample_postraw.phpt:1.2 Sun Jun 14 20:14:04 2009 +++ phpruntests/phpt-tests/sample_postraw.phpt Tue Jun 30 19:43:02 2009 @@ -32,7 +32,7 @@ ["type"]=> string(10) "text/plain" ["tmp_name"]=> -string(14) "%s" +string(%d) "%s" ["error"]=> int(0) ["size"]=> -- 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/json json.c php_json.h
stasTue Jun 30 17:52:21 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/json json.c php_json.h Log: fix json shared build on Windows http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.19.2.24&r2=1.9.2.19.2.25&diff_format=u Index: php-src/ext/json/json.c diff -u php-src/ext/json/json.c:1.9.2.19.2.24 php-src/ext/json/json.c:1.9.2.19.2.25 --- php-src/ext/json/json.c:1.9.2.19.2.24 Wed Jun 24 17:39:52 2009 +++ php-src/ext/json/json.c Tue Jun 30 17:52:21 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: json.c,v 1.9.2.19.2.24 2009/06/24 17:39:52 felipe Exp $ */ +/* $Id: json.c,v 1.9.2.19.2.25 2009/06/30 17:52:21 stas Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -411,7 +411,7 @@ } /* }}} */ -PHPAPI void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_DC) /* {{{ */ +PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_DC) /* {{{ */ { switch (Z_TYPE_P(val)) { @@ -467,7 +467,7 @@ } /* }}} */ -PHPAPI void php_json_decode(zval *return_value, char *str, int str_len, zend_bool assoc, long depth TSRMLS_DC) /* {{{ */ +PHP_JSON_API void php_json_decode(zval *return_value, char *str, int str_len, zend_bool assoc, long depth TSRMLS_DC) /* {{{ */ { int utf16_len; zval *z; http://cvs.php.net/viewvc.cgi/php-src/ext/json/php_json.h?r1=1.8.2.2.2.7&r2=1.8.2.2.2.8&diff_format=u Index: php-src/ext/json/php_json.h diff -u php-src/ext/json/php_json.h:1.8.2.2.2.7 php-src/ext/json/php_json.h:1.8.2.2.2.8 --- php-src/ext/json/php_json.h:1.8.2.2.2.7 Sun May 31 18:55:10 2009 +++ php-src/ext/json/php_json.h Tue Jun 30 17:52:21 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_json.h,v 1.8.2.2.2.7 2009/05/31 18:55:10 andrei Exp $ */ +/* $Id: php_json.h,v 1.8.2.2.2.8 2009/06/30 17:52:21 stas Exp $ */ #ifndef PHP_JSON_H #define PHP_JSON_H @@ -27,6 +27,12 @@ extern zend_module_entry json_module_entry; #define phpext_json_ptr &json_module_entry +#if defined(PHP_WIN32) && defined(JSON_EXPORTS) +#define PHP_JSON_API __declspec(dllexport) +#else +#define PHP_JSON_API PHPAPI +#endif + #ifdef ZTS #include "TSRM.h" #endif @@ -41,8 +47,8 @@ # define JSON_G(v) (json_globals.v) #endif -PHPAPI void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_DC); -PHPAPI void php_json_decode(zval *return_value, char *str, int str_len, zend_bool assoc, long depth TSRMLS_DC); +PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options TSRMLS_DC); +PHP_JSON_API void php_json_decode(zval *return_value, char *str, int str_len, zend_bool assoc, long depth TSRMLS_DC); #endif /* PHP_JSON_H */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: phpruntests /documentation ParallelExecutionStrategy.odp
Hi, The file was added in ASCII. Please remove it and readd it as binary. You can do that with: cvs -kb file.odp Nuno zoe Tue Jun 30 09:41:23 2009 UTC Added files: /phpruntests/documentation ParallelExecutionStrategy.odp Log: parallel execution diagram -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/spl php_spl.c /ext/spl/tests spl_autoload_013.phpt spl_autoload_014.phpt spl_autoload_bug48541.phpt
cseiler Tue Jun 30 17:14:38 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/spl/tests spl_autoload_013.phpt spl_autoload_014.phpt Modified files: /php-srcNEWS /php-src/ext/splphp_spl.c /php-src/ext/spl/tests spl_autoload_bug48541.phpt Log: MFH: spl_autoload_unregister/spl_autoload_functions and closures http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.659&r2=1.2027.2.547.2.965.2.660&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.659 php-src/NEWS:1.2027.2.547.2.965.2.660 --- php-src/NEWS:1.2027.2.547.2.965.2.659 Tue Jun 30 16:17:30 2009 +++ php-src/NEWSTue Jun 30 17:14:37 2009 @@ -2,6 +2,9 @@ ||| ?? ??? 2009, PHP 5.3.1 +- Fixed spl_autoload_unregister/spl_autoad_functions wrt. Closures and + Functors. (Christian Seiler) + - Fixed bug #48681 (openssl signature verification for tar archives broken). (Greg) - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17.2.38&r2=1.52.2.28.2.17.2.39&diff_format=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.38 php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.39 --- php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.38 Sat Jun 13 17:30:50 2009 +++ php-src/ext/spl/php_spl.c Tue Jun 30 17:14:37 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_spl.c,v 1.52.2.28.2.17.2.38 2009/06/13 17:30:50 cellog Exp $ */ +/* $Id: php_spl.c,v 1.52.2.28.2.17.2.39 2009/06/30 17:14:37 cseiler Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -509,10 +509,10 @@ alfi.closure = zcallable; Z_ADDREF_P(zcallable); - lc_name = erealloc(lc_name, func_name_len + 2 + sizeof(zcallable->value.obj.handle)); - memcpy(lc_name + func_name_len, &(zcallable->value.obj.handle), - sizeof(zcallable->value.obj.handle)); - func_name_len += sizeof(zcallable->value.obj.handle); + lc_name = erealloc(lc_name, func_name_len + 2 + sizeof(zend_object_handle)); + memcpy(lc_name + func_name_len, &Z_OBJ_HANDLE_P(zcallable), + sizeof(zend_object_handle)); + func_name_len += sizeof(zend_object_handle); lc_name[func_name_len] = '\0'; } @@ -579,6 +579,7 @@ { char *func_name, *error = NULL; int func_name_len; + char *lc_name = NULL; zval *zcallable; int success = FAILURE; zend_function *spl_func_ptr; @@ -604,10 +605,20 @@ efree(error); } - zend_str_tolower(func_name, func_name_len); + lc_name = safe_emalloc(func_name_len, 1, sizeof(long) + 1); + zend_str_tolower_copy(lc_name, func_name, func_name_len); + efree(func_name); + + if (Z_TYPE_P(zcallable) == IS_OBJECT) { + lc_name = erealloc(lc_name, func_name_len + 2 + sizeof(zend_object_handle)); + memcpy(lc_name + func_name_len, &Z_OBJ_HANDLE_P(zcallable), + sizeof(zend_object_handle)); + func_name_len += sizeof(zend_object_handle); + lc_name[func_name_len] = '\0'; + } if (SPL_G(autoload_functions)) { - if (func_name_len == sizeof("spl_autoload_call")-1 && !strcmp(func_name, "spl_autoload_call")) { + if (func_name_len == sizeof("spl_autoload_call")-1 && !strcmp(lc_name, "spl_autoload_call")) { /* remove all */ zend_hash_destroy(SPL_G(autoload_functions)); FREE_HASHTABLE(SPL_G(autoload_functions)); @@ -616,16 +627,16 @@ success = SUCCESS; } else { /* remove specific */ - success = zend_hash_del(SPL_G(autoload_functions), func_name, func_name_len+1); + success = zend_hash_del(SPL_G(autoload_functions), lc_name, func_name_len+1); if (success != SUCCESS && obj_ptr) { - func_name = erealloc(func_name, func_name_len + 1 + sizeof(zend_object_handle)); - memcpy(func_name + func_name_len, &Z_OBJ_HANDLE_P(obj_ptr), sizeof(zend_object_handle)); + lc_name = erealloc(lc_name, func_name_len + 2 + sizeof(zend_object_handle)); + memcpy(lc_name + func_name_len, &Z_OBJ_HANDLE_P(obj_ptr), sizeof(zend_object_handle)); func_name_len += sizeof(zend_object_handle); - func_name[func
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/date php_date.c
derick Tue Jun 30 16:18:34 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/date php_date.c /php-srcNEWS Log: - MFH: Fixed bug #47351 (Memory leak in DateTime). http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.73&r2=1.43.2.45.2.74&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.73 php-src/ext/date/php_date.c:1.43.2.45.2.74 --- php-src/ext/date/php_date.c:1.43.2.45.2.73 Mon Jun 22 13:42:28 2009 +++ php-src/ext/date/php_date.c Tue Jun 30 16:18:33 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.43.2.45.2.73 2009/06/22 13:42:28 iliaa Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.74 2009/06/30 16:18:33 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -1752,7 +1752,7 @@ } timelib_unixtime2local(now, (timelib_sll) time(NULL)); - timelib_fill_holes(dateobj->time, now, 0); + timelib_fill_holes(dateobj->time, now, TIMELIB_NO_CLONE); timelib_update_ts(dateobj->time, tzi); dateobj->time->have_weekday_relative = dateobj->time->have_relative = 0; http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1574&r2=1.2027.2.547.2.1575&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1574 php-src/NEWS:1.2027.2.547.2.1575 --- php-src/NEWS:1.2027.2.547.2.1574Sun Jun 28 18:44:28 2009 +++ php-src/NEWSTue Jun 30 16:18:34 2009 @@ -22,6 +22,7 @@ - Fixed bug #48450 (Compile failure under IRIX 6.5.30 building gd.c). (Kalle) - Fixed bug #48276 (date("Y") on big endian machines produces the wrong result). (Scott) +- Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John) 17 Jun 2009, PHP 5.2.10 - Updated timezone database to version 2009.9 (2009i) (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) / NEWS /ext/date php_date.c
derick Tue Jun 30 16:17:30 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date php_date.c /php-srcNEWS Log: - MFH: Fixed bug #47351 (Memory leak in DateTime). http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.84&r2=1.43.2.45.2.51.2.85&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.84 php-src/ext/date/php_date.c:1.43.2.45.2.51.2.85 --- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.84 Thu Jun 25 15:07:36 2009 +++ php-src/ext/date/php_date.c Tue Jun 30 16:17:30 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.43.2.45.2.51.2.84 2009/06/25 15:07:36 johannes Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.51.2.85 2009/06/30 16:17:30 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -2414,7 +2414,7 @@ } timelib_unixtime2local(now, (timelib_sll) time(NULL)); - timelib_fill_holes(dateobj->time, now, 0); + timelib_fill_holes(dateobj->time, now, TIMELIB_NO_CLONE); timelib_update_ts(dateobj->time, tzi); dateobj->time->have_relative = 0; http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.658&r2=1.2027.2.547.2.965.2.659&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.658 php-src/NEWS:1.2027.2.547.2.965.2.659 --- php-src/NEWS:1.2027.2.547.2.965.2.658 Tue Jun 30 14:49:11 2009 +++ php-src/NEWSTue Jun 30 16:17:30 2009 @@ -4,6 +4,7 @@ - Fixed bug #48681 (openssl signature verification for tar archives broken). (Greg) +- Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John) - Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo). (Kalle, Rick Yorgason) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
derick Tue Jun 30 16:15:44 2009 UTC Modified files: /php-src/ext/date php_date.c Log: - Fixed bug #47351 (Memory leak in DateTime). http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.240&r2=1.241&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.240 php-src/ext/date/php_date.c:1.241 --- php-src/ext/date/php_date.c:1.240 Thu Jun 25 12:41:41 2009 +++ php-src/ext/date/php_date.c Tue Jun 30 16:15:43 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.240 2009/06/25 12:41:41 iliaa Exp $ */ +/* $Id: php_date.c,v 1.241 2009/06/30 16:15:43 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -2517,7 +2517,7 @@ } timelib_unixtime2local(now, (timelib_sll) time(NULL)); - timelib_fill_holes(dateobj->time, now, 0); + timelib_fill_holes(dateobj->time, now, TIMELIB_NO_CLONE); timelib_update_ts(dateobj->time, tzi); dateobj->time->have_relative = 0; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/taskScheduler rtTask.php rtTaskTestGroup.php /src/testrun rtPhpTestRun.php /tests rtTaskSchedulerTest.php
g2 Tue Jun 30 15:39:52 2009 UTC Modified files: /phpruntests/src/testrunrtPhpTestRun.php /phpruntests/src/taskScheduler rtTask.php rtTaskTestGroup.php /phpruntests/tests rtTaskSchedulerTest.php Log: phpruntests - minor adjustment taskScheduler - fixed tmp bug in testcase http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.16&r2=1.17&diff_format=u Index: phpruntests/src/testrun/rtPhpTestRun.php diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.16 phpruntests/src/testrun/rtPhpTestRun.php:1.17 --- phpruntests/src/testrun/rtPhpTestRun.php:1.16 Tue Jun 30 13:35:42 2009 +++ phpruntests/src/testrun/rtPhpTestRun.phpTue Jun 30 15:39:51 2009 @@ -62,9 +62,8 @@ // create the task-list $taskList = array(); foreach ($subDirectories as $subDirectory) { - $taskList[] = new rtTaskTestGroup($runConfiguration, $subDirectory); + $taskList[] = new rtTaskTestGroup($runConfiguration, $subDirectory, $this->outType); } - // start the task-scheduler for multi-processing $scheduler = rtTaskScheduler::getInstance(); http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTask.php?r1=1.2&r2=1.3&diff_format=u Index: phpruntests/src/taskScheduler/rtTask.php diff -u phpruntests/src/taskScheduler/rtTask.php:1.2 phpruntests/src/taskScheduler/rtTask.php:1.3 --- phpruntests/src/taskScheduler/rtTask.php:1.2Mon Jun 29 01:34:54 2009 +++ phpruntests/src/taskScheduler/rtTask.phpTue Jun 30 15:39:52 2009 @@ -11,7 +11,7 @@ private $message = NULL; - public function finish() {} + public function evaluate() {} public function setState($state) http://cvs.php.net/viewvc.cgi/phpruntests/src/taskScheduler/rtTaskTestGroup.php?r1=1.5&r2=1.6&diff_format=u Index: phpruntests/src/taskScheduler/rtTaskTestGroup.php diff -u phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.5 phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.6 --- phpruntests/src/taskScheduler/rtTaskTestGroup.php:1.5 Mon Jun 29 22:00:13 2009 +++ phpruntests/src/taskScheduler/rtTaskTestGroup.php Tue Jun 30 15:39:52 2009 @@ -15,13 +15,15 @@ { private $runConfiguration; private $subDirectory; + private $outType; private $results; - public function __construct($runConfiguration, $subDirectory) + public function __construct($runConfiguration, $subDirectory, $outType='list') { $this->runConfiguration = $runConfiguration; $this->subDirectory = $subDirectory; + $this->outType = $outType; } @@ -46,12 +48,7 @@ */ public function evaluate($cid=null) { - $outType = 'list'; -if ($this->runConfiguration->hasCommandLineOption('o')) { - $outType = $this->runConfiguration->getCommandLineOption('o'); -} - - $testOutputWriter = rtTestOutputWriter::getInstance($this->results, $outType); + $testOutputWriter = rtTestOutputWriter::getInstance($this->results, $this->outType); $testOutputWriter->write($this->subDirectory, $cid); } http://cvs.php.net/viewvc.cgi/phpruntests/tests/rtTaskSchedulerTest.php?r1=1.2&r2=1.3&diff_format=u Index: phpruntests/tests/rtTaskSchedulerTest.php diff -u phpruntests/tests/rtTaskSchedulerTest.php:1.2 phpruntests/tests/rtTaskSchedulerTest.php:1.3 --- phpruntests/tests/rtTaskSchedulerTest.php:1.2 Sat Jun 27 23:57:46 2009 +++ phpruntests/tests/rtTaskSchedulerTest.php Tue Jun 30 15:39:52 2009 @@ -57,7 +57,10 @@ public function getNumber() { return $this->num; - } + } + + // temp - remove this function + public function getDir() {} } ?> \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/phar tar.c /ext/phar/tests/tar tar_openssl_hash.phpt /ext/phar/tests/tar/files P1-1.0.0.tgz P1-1.0.0.tgz.pubkey
cellog Tue Jun 30 14:49:12 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/phar/tests/tar tar_openssl_hash.phpt /php-src/ext/phar/tests/tar/files P1-1.0.0.tgz P1-1.0.0.tgz.pubkey Modified files: /php-srcNEWS /php-src/ext/phar tar.c Log: fixed bug #48681 (openssl signature verification for tar archives broken) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.657&r2=1.2027.2.547.2.965.2.658&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.657 php-src/NEWS:1.2027.2.547.2.965.2.658 --- php-src/NEWS:1.2027.2.547.2.965.2.657 Tue Jun 30 11:39:15 2009 +++ php-src/NEWSTue Jun 30 14:49:11 2009 @@ -2,6 +2,8 @@ ||| ?? ??? 2009, PHP 5.3.1 +- Fixed bug #48681 (openssl signature verification for tar archives broken). + (Greg) - Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo). (Kalle, Rick Yorgason) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.55.2.29&r2=1.55.2.30&diff_format=u Index: php-src/ext/phar/tar.c diff -u php-src/ext/phar/tar.c:1.55.2.29 php-src/ext/phar/tar.c:1.55.2.30 --- php-src/ext/phar/tar.c:1.55.2.29Thu Jun 4 19:59:09 2009 +++ php-src/ext/phar/tar.c Tue Jun 30 14:49:12 2009 @@ -255,6 +255,8 @@ phar_tar_number(hdr->size, sizeof(hdr->size)); if (((!old && hdr->prefix[0] == 0) || old) && strlen(hdr->name) == sizeof(".phar/signature.bin")-1 && !strncmp(hdr->name, ".phar/signature.bin", sizeof(".phar/signature.bin")-1)) { + off_t curloc; + if (size > 511) { if (error) { spprintf(error, 4096, "phar error: tar-based phar \"%s\" has signature that is larger than 511 bytes, cannot process", fname); @@ -264,6 +266,7 @@ phar_destroy_phar_data(myphar TSRMLS_CC); return FAILURE; } + curloc = php_stream_tell(fp); read = php_stream_read(fp, buf, size); if (read != size) { if (error) { @@ -280,7 +283,7 @@ #else # define PHAR_GET_32(buffer) (php_uint32) *(buffer) #endif - if (FAILURE == phar_verify_signature(fp, php_stream_tell(fp) - size - 512, PHAR_GET_32(buf), buf + 8, PHAR_GET_32(buf + 4), fname, &myphar->signature, &myphar->sig_len, error TSRMLS_CC)) { + if (FAILURE == phar_verify_signature(fp, php_stream_tell(fp) - size - 512, PHAR_GET_32(buf), buf + 8, size - 8, fname, &myphar->signature, &myphar->sig_len, error TSRMLS_CC)) { if (error) { char *save = *error; spprintf(error, 4096, "phar error: tar-based phar \"%s\" signature cannot be verified: %s", fname, save); @@ -288,11 +291,11 @@ } goto bail; } + php_stream_seek(fp, curloc + 512, SEEK_SET); /* signature checked out, let's ensure this is the last file in the phar */ - size = ((size+511)&~511) + 512; if (((hdr->typeflag == '\0') || (hdr->typeflag == TAR_FILE)) && size > 0) { /* this is not good enough - seek succeeds even on truncated tars */ - php_stream_seek(fp, size, SEEK_CUR); + php_stream_seek(fp, 512, SEEK_CUR); if ((uint)php_stream_tell(fp) > totalsize) { if (error) { spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (truncated)", fname); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/tar_openssl_hash.phpt?view=markup&rev=1.1 Index: php-src/ext/phar/tests/tar/tar_openssl_hash.phpt +++ php-src/ext/phar/tests/tar/tar_openssl_hash.phpt --TEST-- Phar: tar archive, require_hash=1, OpenSSL hash --SKIPIF-- --INI-- phar.readonly=1 phar.require_hash=1 --FILE-- getMessage()."\n"; } ?> ===DONE=== --EXPECT-- ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/files/P1-1.0.0.tgz.pubkey?view=markup&rev=1.1 Index: php-src/ext/phar/tests/tar/files/P1-1.0.0.tgz.pubkey +++ php-src/ext/phar/tests/tar/files/P1-1.0.0.tgz.pubkey -BEGIN PUBLIC KEY- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4drcwddPs6LmIbdT1ifT Ev8HXh1Fk1yNusCDoCX6mYkgqvCmx02F/9k5q7n6CPblTcF5mdDI8kcRrUHmyXtD 9X0d7RN7BakZMPH5KPaNkXiXsI9YGSb39AnZgYw01n6u0W6Ohha+KwOsrxkKCF4u LjPLQAlM+3uD8y9Tz2fF+pAE901kHrd3ue7a5i5EtW0bzl5QfxnwFZXAO0StQ9dF slzibRH+1pFjMRxDnlgYmLQF6jMWm9Ty6x9UH9HZ3E3F9QZEQVXWT9
[PHP-CVS] cvs: php-src(PHP_5_3) / README.RELEASE_PROCESS
lsmith Tue Jun 30 14:24:25 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.RELEASE_PROCESS Log: MFH: expanded the section about how to create the changelog http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.1.2.20&r2=1.1.2.21&diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.1.2.20 php-src/README.RELEASE_PROCESS:1.1.2.21 --- php-src/README.RELEASE_PROCESS:1.1.2.20 Tue Jun 30 11:37:24 2009 +++ php-src/README.RELEASE_PROCESS Tue Jun 30 14:24:25 2009 @@ -210,6 +210,10 @@ III. ``s/Fixed bug #\([0-9]\+\)//`` + IV. ``s/Fixed PECL bug #\([0-9]\+\)//`` + + V. ``s/FR #\([0-9]\+\)/FR /`` + 4. ``cp releases/4_4_0.php releases/4_4_1.php`` 5. ``cvs add releases/4_4_1.php`` -- 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 Jun 30 14:24:15 2009 UTC Modified files: /php-srcREADME.RELEASE_PROCESS Log: expanded the section about how to create the changelog http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.20&r2=1.21&diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.20 php-src/README.RELEASE_PROCESS:1.21 --- php-src/README.RELEASE_PROCESS:1.20 Tue Jun 30 11:37:16 2009 +++ php-src/README.RELEASE_PROCESS Tue Jun 30 14:24:15 2009 @@ -210,6 +210,10 @@ III. ``s/Fixed bug #\([0-9]\+\)//`` + IV. ``s/Fixed PECL bug #\([0-9]\+\)//`` + + V. ``s/FR #\([0-9]\+\)/FR /`` + 4. ``cp releases/4_4_0.php releases/4_4_1.php`` 5. ``cvs add releases/4_4_1.php`` -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase/output rtTestOutputWriterCSV.php
zoe Tue Jun 30 13:36:49 2009 UTC Modified files: /phpruntests/src/testcase/outputrtTestOutputWriterCSV.php Log: change to preserve as CSV http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/output/rtTestOutputWriterCSV.php?r1=1.2&r2=1.3&diff_format=u Index: phpruntests/src/testcase/output/rtTestOutputWriterCSV.php diff -u phpruntests/src/testcase/output/rtTestOutputWriterCSV.php:1.2 phpruntests/src/testcase/output/rtTestOutputWriterCSV.php:1.3 --- phpruntests/src/testcase/output/rtTestOutputWriterCSV.php:1.2 Mon Jun 29 01:34:54 2009 +++ phpruntests/src/testcase/output/rtTestOutputWriterCSV.php Tue Jun 30 13:36:49 2009 @@ -3,7 +3,7 @@ * rtTestOutputWriterCSV * * Write minimal testoutput and status a CSV - * + * * @category Testing * @packageRUNTESTS * @author Zoe Slattery @@ -11,7 +11,7 @@ * @copyright 2009 The PHP Group * @licensehttp://www.php.net/license/3_01.txt PHP License 3.01 * @link http://qa.php.net/ - * + * */ class rtTestOutputWriterCSV extends rtTestOutputWriter { @@ -36,7 +36,7 @@ foreach($testStatus->getTestStateNames() as $name) { if($testStatus->getValue($name)) { $outputString .= " , ". strtoupper($name); - + } } $this->testOutput[] = $outputString; @@ -47,13 +47,15 @@ public function write($testDirectory = null, $cid = null) { sort($this->testOutput); -foreach ($this->testOutput as $line) { - - if (!is_null($cid)) { - echo "$cid - "; - } - - echo $line ."\n"; +foreach ($this->testOutput as $line) { + +echo $line; + +if (!is_null($cid)) { +echo ", $cid \n"; +} else { +echo "\n"; +} } } } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testrun rtPhpTestRun.php
zoe Tue Jun 30 13:35:42 2009 UTC Modified files: /phpruntests/src/testrunrtPhpTestRun.php Log: changes in line with rtTestStatus - missed before http://cvs.php.net/viewvc.cgi/phpruntests/src/testrun/rtPhpTestRun.php?r1=1.15&r2=1.16&diff_format=u Index: phpruntests/src/testrun/rtPhpTestRun.php diff -u phpruntests/src/testrun/rtPhpTestRun.php:1.15 phpruntests/src/testrun/rtPhpTestRun.php:1.16 --- phpruntests/src/testrun/rtPhpTestRun.php:1.15 Mon Jun 29 01:34:54 2009 +++ phpruntests/src/testrun/rtPhpTestRun.phpTue Jun 30 13:35:42 2009 @@ -121,13 +121,13 @@ //Read the test file $testFile = new rtPhpTestFile(); $testFile->doRead($testName); -$testFile->normaliseLineEndings($testName); +$testFile->normaliseLineEndings(); + $testStatus = new rtTestStatus($testFile->getTestName()); if ($testFile->arePreconditionsMet()) { - $testCase = new rtPhpTest($testFile->getContents(), $testFile->getTestName(), $testFile->getSectionHeadings(), $runConfiguration, $testStatus); //Setup and set the local environment for the test case @@ -137,7 +137,9 @@ $results->processResults($testCase, $runConfiguration); } else { -$results = new rtTestResults(null, $testFile->getExitMessage(), $testFile->getTestName()); +$testStatus->setTrue('bork'); +$testStatus->setMessage('bork', $testFile->getExitMessage()); +$results = new rtTestResults(null, $testStatus); } $testOutputWriter = rtTestOutputWriter::getInstance(array($results), 'list'); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase rtPhpTestFile.php
zoe Tue Jun 30 13:34:56 2009 UTC Modified files: /phpruntests/src/testcase rtPhpTestFile.php Log: Changes to discard empty test sections http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtPhpTestFile.php?r1=1.4&r2=1.5&diff_format=u Index: phpruntests/src/testcase/rtPhpTestFile.php diff -u phpruntests/src/testcase/rtPhpTestFile.php:1.4 phpruntests/src/testcase/rtPhpTestFile.php:1.5 --- phpruntests/src/testcase/rtPhpTestFile.php:1.4 Mon May 25 12:46:57 2009 +++ phpruntests/src/testcase/rtPhpTestFile.php Tue Jun 30 13:34:56 2009 @@ -28,71 +28,81 @@ 'rtHasNoDuplicateSections', 'rtIsValidSectionName', 'rtIsSectionImplemented' -); +); -/** - * Reads the contents of the test file and creates an array of the contents. - * - * @param string $testFile (file name) - */ -public function doRead($testFile) -{ -$this->testFileName = realpath($testFile); -$this->testName= dirname($this->testFileName).DIRECTORY_SEPARATOR.basename($this->testFileName, ".phpt"); -$this->testContents = file($this->testFileName); -} - -public function normaliseLineEndings() -{ -for ($i=0; $itestContents); $i++) { -//This is not nice but there are a huge number of tests with random spacs at the end of the section header -if (preg_match("/--([A-Z]+(_[A-Z]+|))--/", $this->testContents[$i], $matches)) { -$this->sectionHeadings[] = $matches[1]; -$this->testContents[$i] = $matches[1]; -} else { -$this->testContents[$i] = rtrim($this->testContents[$i], $this->carriageReturn.$this->newLine); +/** + * Reads the contents of the test file and creates an array of the contents. + * + * @param string $testFile (file name) + */ +public function doRead($testFile) +{ +$this->testFileName = realpath($testFile); +$this->testName= dirname($this->testFileName).DIRECTORY_SEPARATOR.basename($this->testFileName, ".phpt"); +$this->testContents = file($this->testFileName); +} + +public function normaliseLineEndings() +{ +$tempArray = array(); +for ($i=0; $itestContents); $i++) { +//This is not nice but there are a huge number of tests with random spacs at the end of the section header +//and empty sections. +if (preg_match("/--([A-Z]+(_[A-Z]+|))--/", $this->testContents[$i], $matches)) { +//look ahead to next section unless this is the last test section. +//if the EXPECT section is empty (missing) it will be caught by preconditions. +//If the next line is also a section heading than skip adding it to the test case or headings. +if($i< count($this->testContents) - 1) { +if (!preg_match("/--([A-Z]+(_[A-Z]+|))--/", $this->testContents[$i+1])) { +$this->sectionHeadings[] = $matches[1]; +$tempArray[] = $matches[1]; +} +} +} else { +$tempArray[] = rtrim($this->testContents[$i], $this->carriageReturn.$this->newLine); +} } +$this->testContents = $tempArray; } -} - -public function arePreConditionsMet() -{ -foreach ($this->preConditions as $preCondition) { -$condition = new $preCondition; -if (!$condition->isMet($this->sectionHeadings)) { - $this->testExitMessage = $condition->getMessage(); - return false; + +public function arePreConditionsMet() +{ +foreach ($this->preConditions as $preCondition) { +$condition = new $preCondition; +if (!$condition->isMet($this->sectionHeadings)) { +$this->testExitMessage = $condition->getMessage(); +return false; +} } +return true; +} + +public function getContents() +{ +return $this->testContents; +} + +public function getSectionHeadings() +{ +return $this->sectionHeadings; } -return true; -} -public function getContents() -{ -return $this->testContents; -} - -public function getSectionHeadings() -{ -return $this->sectionHeadings; -} - - -public function getTestName() -{ -return $this->testName; -} - - -public function getTestFileName() -{ -return $this->testFileName; -} - - -public function getExitMessage() -{ -return $this->testExitMessage; -} + +public function getTestName
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/hash hash_adler32.c /ext/hash/tests adler32.phpt hash_copy_001.phpt hash_file_basic1.phpt hash_hmac_basic.phpt hash_hmac_file_basic.phpt
scottmacTue Jun 30 13:21:54 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/hash hash_adler32.c /php-src/ext/hash/tests adler32.phpt hash_copy_001.phpt hash_file_basic1.phpt hash_hmac_basic.phpt hash_hmac_file_basic.phpt Log: MFH Fix bug #48284 - adler32 is in the wrong order. Changed to match what zlib produces. http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash_adler32.c?r1=1.3.2.4.2.2.2.3&r2=1.3.2.4.2.2.2.4&diff_format=u Index: php-src/ext/hash/hash_adler32.c diff -u php-src/ext/hash/hash_adler32.c:1.3.2.4.2.2.2.3 php-src/ext/hash/hash_adler32.c:1.3.2.4.2.2.2.4 --- php-src/ext/hash/hash_adler32.c:1.3.2.4.2.2.2.3 Wed Dec 31 11:15:37 2008 +++ php-src/ext/hash/hash_adler32.c Tue Jun 30 13:21:53 2009 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: hash_adler32.c,v 1.3.2.4.2.2.2.3 2008/12/31 11:15:37 sebastian Exp $ */ +/* $Id: hash_adler32.c,v 1.3.2.4.2.2.2.4 2009/06/30 13:21:53 scottmac Exp $ */ #include "php_hash.h" #include "php_hash_adler32.h" @@ -42,10 +42,10 @@ PHP_HASH_API void PHP_ADLER32Final(unsigned char digest[4], PHP_ADLER32_CTX *context) { - digest[3] = (unsigned char) ((context->state >> 24) & 0xff); - digest[2] = (unsigned char) ((context->state >> 16) & 0xff); - digest[1] = (unsigned char) ((context->state >> 8) & 0xff); - digest[0] = (unsigned char) (context->state & 0xff); + digest[0] = (unsigned char) ((context->state >> 24) & 0xff); + digest[1] = (unsigned char) ((context->state >> 16) & 0xff); + digest[2] = (unsigned char) ((context->state >> 8) & 0xff); + digest[3] = (unsigned char) (context->state & 0xff); context->state = 0; } http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/adler32.phpt?r1=1.1.2.1&r2=1.1.2.1.4.1&diff_format=u Index: php-src/ext/hash/tests/adler32.phpt diff -u php-src/ext/hash/tests/adler32.phpt:1.1.2.1 php-src/ext/hash/tests/adler32.phpt:1.1.2.1.4.1 --- php-src/ext/hash/tests/adler32.phpt:1.1.2.1 Sat Dec 3 10:31:01 2005 +++ php-src/ext/hash/tests/adler32.phpt Tue Jun 30 13:21:53 2009 @@ -13,10 +13,10 @@ echo hash('adler32', '12345678901234567890123456789012345678901234567890123456789012345678901234567890'), "\n"; ?> --EXPECT-- -0100 -62006200 -27014d02 -86057529 -200b8690 -0c15db8a -6910b697 +0001 +00620062 +024d0127 +29750586 +90860b20 +8adb150c +97b61069 http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_copy_001.phpt?r1=1.1.2.5&r2=1.1.2.6&diff_format=u Index: php-src/ext/hash/tests/hash_copy_001.phpt diff -u php-src/ext/hash/tests/hash_copy_001.phpt:1.1.2.5 php-src/ext/hash/tests/hash_copy_001.phpt:1.1.2.6 --- php-src/ext/hash/tests/hash_copy_001.phpt:1.1.2.5 Sat Dec 27 01:05:07 2008 +++ php-src/ext/hash/tests/hash_copy_001.phpt Tue Jun 30 13:21:53 2009 @@ -71,8 +71,8 @@ string(64) "fbe88daa74c89b9e29468fa3cd3a657d31845e21bb58dd3f8d806f5179a85c26" string(64) "5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5" string(64) "5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5" -string(8) "28097c6f" -string(8) "28097c6f" +string(8) "6f7c0928" +string(8) "6f7c0928" string(8) "e5cfc160" string(8) "e5cfc160" string(8) "69147a4e" @@ -155,8 +155,8 @@ string(64) "614ca924864fa0e8fa309aa0944e047d5edbfd4964a35858f4d8ec66a0fb88b0" string(64) "5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5" string(64) "a00961e371287c71c527a41c14564f13b6ed12ac7cd9d5f5dfb3542a25e28d3b" -string(8) "28097c6f" -string(8) "471714d9" +string(8) "6f7c0928" +string(8) "d9141747" string(8) "e5cfc160" string(8) "59f8d3d2" string(8) "69147a4e" http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_file_basic1.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/hash/tests/hash_file_basic1.phpt diff -u php-src/ext/hash/tests/hash_file_basic1.phpt:1.1.2.2 php-src/ext/hash/tests/hash_file_basic1.phpt:1.1.2.3 --- php-src/ext/hash/tests/hash_file_basic1.phpt:1.1.2.2Wed Jan 7 14:32:46 2009 +++ php-src/ext/hash/tests/hash_file_basic1.phptTue Jun 30 13:21:53 2009 @@ -61,7 +61,7 @@ ===Done=== --EXPECTF-- *** Testing hash_file() : basic functionality *** -adler32: 2e2287ff +adler32: ff87222e crc32: 61664d33 gost: d9e65f0c0c2ef944e4f8a01f4a46365c4f33a2853756878182a7f03e1490a4cd haval128,3: 8bb81269aca8b7f87829020d76a4e841 @@ -79,7 +79,7 @@ snefru: d414b2345d3e7fa1a31c044cf334bfc1fec24d89e464411998d579d24663895f tiger192,3: c6fa75a0be4ecf7afa3cafb4e2a08efc3a40534c0e46b971 whirlpool: 4248b149e000477269a4a5f1a84d97cfc3d0199b7aaf505913e6f010a6f83276029d11a9ad545374bc710eb59c7d958985023ab886ffa9ec9a23852844c764ec -adler32(raw): 2e2287ff +adler32(raw): ff87222e md5(raw): 704bf818448f5bbb94061332d2c889aa sha256(raw): a0f5702fa5d3670b80033d668e8732b70550392abb53841355447f8bb0f72245 -===Done=== \ No newline at end of file +===Do
[PHP-CVS] cvs: php-src /ext/hash/tests adler32.phpt hash_copy_001.phpt hash_file_basic1.phpt hash_hmac_basic.phpt hash_hmac_file_basic.phpt
scottmacTue Jun 30 12:50:17 2009 UTC Modified files: /php-src/ext/hash/tests adler32.phpt hash_copy_001.phpt hash_file_basic1.phpt hash_hmac_basic.phpt hash_hmac_file_basic.phpt Log: Fix tests for bug #48284 - adler32 is in the wrong order. http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/adler32.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/hash/tests/adler32.phpt diff -u php-src/ext/hash/tests/adler32.phpt:1.4 php-src/ext/hash/tests/adler32.phpt:1.5 --- php-src/ext/hash/tests/adler32.phpt:1.4 Mon Oct 2 01:38:05 2006 +++ php-src/ext/hash/tests/adler32.phpt Tue Jun 30 12:50:16 2009 @@ -13,10 +13,10 @@ echo hash('adler32', '12345678901234567890123456789012345678901234567890123456789012345678901234567890'), "\n"; ?> --EXPECT-- -0100 -62006200 -27014d02 -86057529 -200b8690 -0c15db8a -6910b697 +0001 +00620062 +024d0127 +29750586 +90860b20 +8adb150c +97b61069 http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_copy_001.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/hash/tests/hash_copy_001.phpt diff -u php-src/ext/hash/tests/hash_copy_001.phpt:1.5 php-src/ext/hash/tests/hash_copy_001.phpt:1.6 --- php-src/ext/hash/tests/hash_copy_001.phpt:1.5 Sat Dec 27 01:04:09 2008 +++ php-src/ext/hash/tests/hash_copy_001.phpt Tue Jun 30 12:50:16 2009 @@ -71,8 +71,8 @@ unicode(64) "fbe88daa74c89b9e29468fa3cd3a657d31845e21bb58dd3f8d806f5179a85c26" unicode(64) "5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5" unicode(64) "5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5" -unicode(8) "28097c6f" -unicode(8) "28097c6f" +unicode(8) "6f7c0928" +unicode(8) "6f7c0928" unicode(8) "e5cfc160" unicode(8) "e5cfc160" unicode(8) "69147a4e" @@ -155,8 +155,8 @@ unicode(64) "614ca924864fa0e8fa309aa0944e047d5edbfd4964a35858f4d8ec66a0fb88b0" unicode(64) "5820c7c4a0650587538b30ef4099f2b5993069758d5c847a552e6ef7360766a5" unicode(64) "a00961e371287c71c527a41c14564f13b6ed12ac7cd9d5f5dfb3542a25e28d3b" -unicode(8) "28097c6f" -unicode(8) "471714d9" +unicode(8) "6f7c0928" +unicode(8) "d9141747" unicode(8) "e5cfc160" unicode(8) "59f8d3d2" unicode(8) "69147a4e" http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_file_basic1.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/hash/tests/hash_file_basic1.phpt diff -u php-src/ext/hash/tests/hash_file_basic1.phpt:1.1 php-src/ext/hash/tests/hash_file_basic1.phpt:1.2 --- php-src/ext/hash/tests/hash_file_basic1.phpt:1.1Wed Jan 7 14:30:06 2009 +++ php-src/ext/hash/tests/hash_file_basic1.phptTue Jun 30 12:50:16 2009 @@ -61,7 +61,7 @@ ===Done=== --EXPECTF-- *** Testing hash_file() : basic functionality *** -adler32: 2e2287ff +adler32: ff87222e crc32: 61664d33 gost: d9e65f0c0c2ef944e4f8a01f4a46365c4f33a2853756878182a7f03e1490a4cd haval128,3: 8bb81269aca8b7f87829020d76a4e841 @@ -79,7 +79,7 @@ snefru: d414b2345d3e7fa1a31c044cf334bfc1fec24d89e464411998d579d24663895f tiger192,3: c6fa75a0be4ecf7afa3cafb4e2a08efc3a40534c0e46b971 whirlpool: 4248b149e000477269a4a5f1a84d97cfc3d0199b7aaf505913e6f010a6f83276029d11a9ad545374bc710eb59c7d958985023ab886ffa9ec9a23852844c764ec -adler32(raw): 2e2287ff +adler32(raw): ff87222e md5(raw): 704bf818448f5bbb94061332d2c889aa sha256(raw): a0f5702fa5d3670b80033d668e8732b70550392abb53841355447f8bb0f72245 -===Done=== \ No newline at end of file +===Done=== http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_hmac_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/hash/tests/hash_hmac_basic.phpt diff -u php-src/ext/hash/tests/hash_hmac_basic.phpt:1.1 php-src/ext/hash/tests/hash_hmac_basic.phpt:1.2 --- php-src/ext/hash/tests/hash_hmac_basic.phpt:1.1 Wed Jan 7 14:30:06 2009 +++ php-src/ext/hash/tests/hash_hmac_basic.phpt Tue Jun 30 12:50:16 2009 @@ -42,7 +42,7 @@ ===Done=== --EXPECTF-- *** Testing hash_hmac() : basic functionality *** -adler32: 9e033311 +adler32: 12c803f7 crc32: 96859101 gost: a4a3c80bdf3f8665bf07376a34dc9c1b11af7c813f4928f62e39f0c0dc564dad haval128,3: 82cd0f4bd36729b5c80c33efa8c13ac5 @@ -60,7 +60,7 @@ snefru: 67af483046f9cf16fe19f9087929ccfc6ad176ade3290b4d33f43e0ddb07e711 tiger192,3: 82779797cdc439e886884953ba21fa38e35679041e95ee27 whirlpool: 4a0f1582b21b7aff59bfba7f9c29131c69741b2ce80acdc7d314040f3b768cf5a17e30b74cceb86fbc6b34b1692e0addd5bfd7cfc043d40c0621f1b97e26fa49 -adler32(raw): 9e033311 +adler32(raw): 12c803f7 md5(raw): 2a632783e2812cf23de100d7d6a463ae sha256(raw): 49bde3496b9510a17d0edd8a4b0ac70148e32a1d51e881ec76faa96534125838 -===Done=== \ No newline at end of file +===Done=== http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/hash_hmac_file_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/hash/tests/hash_hmac_file_basic.phpt diff -u php-src/ext/hash/tests/hash_hmac_file_basic.phpt:1.1 php-src/ext/hash/tests/hash_hmac_file_basic.phpt:1.2 --- php-src/ext/hash/tests/hash_hmac_file_basic.phpt
[PHP-CVS] cvs: php-src /ext/hash hash_adler32.c
scottmacTue Jun 30 12:49:54 2009 UTC Modified files: /php-src/ext/hash hash_adler32.c Log: Fix bug #48284 - adler32 is in the wrong order. Changed to match what zlib produces. http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash_adler32.c?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/hash/hash_adler32.c diff -u php-src/ext/hash/hash_adler32.c:1.11 php-src/ext/hash/hash_adler32.c:1.12 --- php-src/ext/hash/hash_adler32.c:1.11Tue Mar 10 23:39:18 2009 +++ php-src/ext/hash/hash_adler32.c Tue Jun 30 12:49:54 2009 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: hash_adler32.c,v 1.11 2009/03/10 23:39:18 helly Exp $ */ +/* $Id: hash_adler32.c,v 1.12 2009/06/30 12:49:54 scottmac Exp $ */ #include "php_hash.h" #include "php_hash_adler32.h" @@ -42,10 +42,10 @@ PHP_HASH_API void PHP_ADLER32Final(unsigned char digest[4], PHP_ADLER32_CTX *context) { - digest[3] = (unsigned char) ((context->state >> 24) & 0xff); - digest[2] = (unsigned char) ((context->state >> 16) & 0xff); - digest[1] = (unsigned char) ((context->state >> 8) & 0xff); - digest[0] = (unsigned char) (context->state & 0xff); + digest[0] = (unsigned char) ((context->state >> 24) & 0xff); + digest[1] = (unsigned char) ((context->state >> 16) & 0xff); + digest[2] = (unsigned char) ((context->state >> 8) & 0xff); + digest[3] = (unsigned char) (context->state & 0xff); context->state = 0; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /main php_open_temporary_file.c
iliaa Tue Jun 30 12:20:35 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/main php_open_temporary_file.c Log: MFB: Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using TMPDIR). http://cvs.php.net/viewvc.cgi/php-src/main/php_open_temporary_file.c?r1=1.34.2.1.2.10.2.4&r2=1.34.2.1.2.10.2.5&diff_format=u Index: php-src/main/php_open_temporary_file.c diff -u php-src/main/php_open_temporary_file.c:1.34.2.1.2.10.2.4 php-src/main/php_open_temporary_file.c:1.34.2.1.2.10.2.5 --- php-src/main/php_open_temporary_file.c:1.34.2.1.2.10.2.4Wed Jun 24 20:08:54 2009 +++ php-src/main/php_open_temporary_file.c Tue Jun 30 12:20:35 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.10.2.4 2009/06/24 20:08:54 iliaa Exp $ */ +/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.10.2.5 2009/06/30 12:20:35 iliaa Exp $ */ #include "php.h" @@ -199,8 +199,15 @@ /* On Unix use the (usual) TMPDIR environment variable. */ { char* s = getenv("TMPDIR"); - if (s) { - temporary_directory = strdup(s); + if (s && *s) { + int len = strlen(s); + + if (s[len - 1] == DEFAULT_SLASH) { + temporary_directory = zend_strndup(s, len - 1); + } else { + temporary_directory = zend_strndup(s, len); + } + return temporary_directory; } } -- 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 metaphone.c /ext/standard/tests/strings bug48709.phpt
felipe Tue Jun 30 11:46:20 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings bug48709.phpt Modified files: /php-src/ext/standard metaphone.c Log: - MFH: Fixed bug #48709 (metaphone and 'wh') http://cvs.php.net/viewvc.cgi/php-src/ext/standard/metaphone.c?r1=1.28.2.1.2.4.2.5&r2=1.28.2.1.2.4.2.6&diff_format=u Index: php-src/ext/standard/metaphone.c diff -u php-src/ext/standard/metaphone.c:1.28.2.1.2.4.2.5 php-src/ext/standard/metaphone.c:1.28.2.1.2.4.2.6 --- php-src/ext/standard/metaphone.c:1.28.2.1.2.4.2.5 Wed Feb 18 22:34:06 2009 +++ php-src/ext/standard/metaphone.cTue Jun 30 11:46:20 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: metaphone.c,v 1.28.2.1.2.4.2.5 2009/02/18 22:34:06 felipe Exp $ */ +/* $Id: metaphone.c,v 1.28.2.1.2.4.2.6 2009/06/30 11:46:20 felipe Exp $ */ /* Based on CPANs "Text-Metaphone-1.96" by Michael G Schwern @@ -225,15 +225,14 @@ w_idx += 2; } break; - /* WH becomes H, + /* WH becomes W, WR becomes R W if followed by a vowel */ case 'W': - if (Next_Letter == 'H' || - Next_Letter == 'R') { + if (Next_Letter == 'R') { Phonize(Next_Letter); w_idx += 2; - } else if (isvowel(Next_Letter)) { + } else if (Next_Letter == 'H' || isvowel(Next_Letter)) { Phonize('W'); w_idx += 2; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug48709.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/bug48709.phpt +++ php-src/ext/standard/tests/strings/bug48709.phpt --TEST-- Bug #48709 (metaphone and 'wh') --FILE-- %s\n", $letter, metaphone($letter)); } ?> --EXPECT-- kn => N gn => N pn => N ae => E wr => R x => S wh => W wa => W -- 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 /win32 sendmail.c
kalle Tue Jun 30 11:39:16 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS /php-src/win32 sendmail.c Log: MFH: Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo) # Note, this does not go in 5.2 because the inet ports for VC6 are not in that branch http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.656&r2=1.2027.2.547.2.965.2.657&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.656 php-src/NEWS:1.2027.2.547.2.965.2.657 --- php-src/NEWS:1.2027.2.547.2.965.2.656 Mon Jun 29 16:33:24 2009 +++ php-src/NEWSTue Jun 30 11:39:15 2009 @@ -1,7 +1,10 @@ -PHPNEWS +PHP NEWS ||| ?? ??? 2009, PHP 5.3.1 +- Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo). + (Kalle, Rick Yorgason) + 30 Jun 2009, PHP 5.3.0 - Upgraded bundled PCRE to version 7.9. (Nuno) http://cvs.php.net/viewvc.cgi/php-src/win32/sendmail.c?r1=1.65.2.2.2.1&r2=1.65.2.2.2.1.2.1&diff_format=u Index: php-src/win32/sendmail.c diff -u php-src/win32/sendmail.c:1.65.2.2.2.1 php-src/win32/sendmail.c:1.65.2.2.2.1.2.1 --- php-src/win32/sendmail.c:1.65.2.2.2.1 Sat Feb 24 02:17:28 2007 +++ php-src/win32/sendmail.cTue Jun 30 11:39:15 2009 @@ -17,7 +17,7 @@ * */ -/* $Id: sendmail.c,v 1.65.2.2.2.1 2007/02/24 02:17:28 helly Exp $ */ +/* $Id: sendmail.c,v 1.65.2.2.2.1.2.1 2009/06/30 11:39:15 kalle Exp $ */ #include "php.h" /*php specific */ #include @@ -37,6 +37,7 @@ #endif /* NETWARE */ #include "sendmail.h" #include "php_ini.h" +#include "inet.h" #if HAVE_PCRE || HAVE_BUNDLED_PCRE #include "ext/pcre/php_pcre.h" @@ -765,16 +766,52 @@ static int MailConnect() { - int res; + int res, namelen; short portnum; + struct hostent *ent; + IN_ADDR addr; +#ifdef HAVE_IPV6 + IN6_ADDR addr6; +#endif /* Create Socket */ - if ((sc = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) + if ((sc = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) { return (FAILED_TO_OBTAIN_SOCKET_HANDLE); + } /* Get our own host name */ - if (gethostname(LocalHost, HOST_NAME_LEN)) + if (gethostname(LocalHost, HOST_NAME_LEN)) { + return (FAILED_TO_GET_HOSTNAME); + } + + ent = gethostbyname(LocalHost); + + if (!ent) { return (FAILED_TO_GET_HOSTNAME); + } + + namelen = strlen(ent->h_name); + +#ifdef HAVE_IPV6 + if (inet_pton(AF_INET, ent->h_name, &addr) == 1 || inet_pton(AF_INET6, ent->h_name, &addr6) == 1) +#else + if (inet_pton(AF_INET, ent->h_name, &addr) == 1) +#endif + { + if (namelen + 2 >= HOST_NAME_LEN) { + return (FAILED_TO_GET_HOSTNAME); + } + + strcpy(LocalHost, "["); + strcpy(LocalHost + 1, ent->h_name); + strcpy(LocalHost + namelen + 1, "]"); + } else { + if (namelen >= HOST_NAME_LEN) { + return (FAILED_TO_GET_HOSTNAME); + } + + strcpy(LocalHost, ent->h_name); + } /* Resolve the servers IP */ /* @@ -794,8 +831,9 @@ sock_in.sin_port = htons(portnum); sock_in.sin_addr.S_un.S_addr = GetAddr(MailHost); - if (connect(sc, (LPSOCKADDR) & sock_in, sizeof(sock_in))) + if (connect(sc, (LPSOCKADDR) & sock_in, sizeof(sock_in))) { return (FAILED_TO_CONNECT); + } /* receive Server welcome message */ res = Ack(NULL); -- 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 Tue Jun 30 11:37:24 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.RELEASE_PROCESS Log: MFH: formatting fix for the re-releasing section http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.1.2.19&r2=1.1.2.20&diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.1.2.19 php-src/README.RELEASE_PROCESS:1.1.2.20 --- php-src/README.RELEASE_PROCESS:1.1.2.19 Wed Jun 10 18:15:22 2009 +++ php-src/README.RELEASE_PROCESS Tue Jun 30 11:37:24 2009 @@ -248,9 +248,8 @@ II. For PHP5: Set $CURRENT_QA_RELEASE_5 to false - Re-releasing the same version (or -pl) - +-- 1. Commit the new binaries to ``phpweb/distributions/`` @@ -281,4 +280,3 @@ 5. Wait an hour or two, then send a mail to php-annou...@lists.php.net, php-gene...@lists.php.net and intern...@lists.php.net with a text similar to the news entry. - -- 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 Jun 30 11:37:16 2009 UTC Modified files: /php-srcREADME.RELEASE_PROCESS Log: formatting fix for the re-releasing section http://cvs.php.net/viewvc.cgi/php-src/README.RELEASE_PROCESS?r1=1.19&r2=1.20&diff_format=u Index: php-src/README.RELEASE_PROCESS diff -u php-src/README.RELEASE_PROCESS:1.19 php-src/README.RELEASE_PROCESS:1.20 --- php-src/README.RELEASE_PROCESS:1.19 Wed Jun 10 18:15:12 2009 +++ php-src/README.RELEASE_PROCESS Tue Jun 30 11:37:16 2009 @@ -248,9 +248,8 @@ II. For PHP5: Set $CURRENT_QA_RELEASE_5 to false - Re-releasing the same version (or -pl) - +-- 1. Commit the new binaries to ``phpweb/distributions/`` @@ -281,4 +280,3 @@ 5. Wait an hour or two, then send a mail to php-annou...@lists.php.net, php-gene...@lists.php.net and intern...@lists.php.net with a text similar to the news entry. - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 sendmail.c
kalle Tue Jun 30 11:36:58 2009 UTC Modified files: /php-src/win32 sendmail.c Log: Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo) http://cvs.php.net/viewvc.cgi/php-src/win32/sendmail.c?r1=1.70&r2=1.71&diff_format=u Index: php-src/win32/sendmail.c diff -u php-src/win32/sendmail.c:1.70 php-src/win32/sendmail.c:1.71 --- php-src/win32/sendmail.c:1.70 Fri Jul 6 23:06:51 2007 +++ php-src/win32/sendmail.cTue Jun 30 11:36:58 2009 @@ -17,7 +17,7 @@ * */ -/* $Id: sendmail.c,v 1.70 2007/07/06 23:06:51 dmitry Exp $ */ +/* $Id: sendmail.c,v 1.71 2009/06/30 11:36:58 kalle Exp $ */ #include "php.h" /*php specific */ #include @@ -37,6 +37,7 @@ #endif /* NETWARE */ #include "sendmail.h" #include "php_ini.h" +#include "inet.h" #if HAVE_PCRE || HAVE_BUNDLED_PCRE #include "ext/pcre/php_pcre.h" @@ -765,16 +766,52 @@ static int MailConnect() { - int res; + int res, namelen; short portnum; + struct hostent *ent; + IN_ADDR addr; +#ifdef HAVE_IPV6 + IN6_ADDR addr6; +#endif /* Create Socket */ - if ((sc = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) + if ((sc = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) { return (FAILED_TO_OBTAIN_SOCKET_HANDLE); + } /* Get our own host name */ - if (gethostname(LocalHost, HOST_NAME_LEN)) + if (gethostname(LocalHost, HOST_NAME_LEN)) { + return (FAILED_TO_GET_HOSTNAME); + } + + ent = gethostbyname(LocalHost); + + if (!ent) { return (FAILED_TO_GET_HOSTNAME); + } + + namelen = strlen(ent->h_name); + +#ifdef HAVE_IPV6 + if (inet_pton(AF_INET, ent->h_name, &addr) == 1 || inet_pton(AF_INET6, ent->h_name, &addr6) == 1) +#else + if (inet_pton(AF_INET, ent->h_name, &addr) == 1) +#endif + { + if (namelen + 2 >= HOST_NAME_LEN) { + return (FAILED_TO_GET_HOSTNAME); + } + + strcpy(LocalHost, "["); + strcpy(LocalHost + 1, ent->h_name); + strcpy(LocalHost + namelen + 1, "]"); + } else { + if (namelen >= HOST_NAME_LEN) { + return (FAILED_TO_GET_HOSTNAME); + } + + strcpy(LocalHost, ent->h_name); + } /* Resolve the servers IP */ /* @@ -794,8 +831,9 @@ sock_in.sin_port = htons(portnum); sock_in.sin_addr.S_un.S_addr = GetAddr(MailHost); - if (connect(sc, (LPSOCKADDR) & sock_in, sizeof(sock_in))) + if (connect(sc, (LPSOCKADDR) & sock_in, sizeof(sock_in))) { return (FAILED_TO_CONNECT); + } /* receive Server welcome message */ res = Ack(NULL); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / php.ini-development php.ini-production
On Tue, Jun 30, 2009 at 11:15, Jani Taskinen wrote: > Hannes Magnusson wrote: >> >> bjori Tue Jun 30 08:49:05 2009 UTC >> >> Modified files: /php-src php.ini-production >> php.ini-development Log: >> MFB5.3: Add missing ini entries (Mikko) >> >> http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.12&r2=1.13&diff_format=u >> Index: php-src/php.ini-production >> diff -u php-src/php.ini-production:1.12 php-src/php.ini-production:1.13 >> --- php-src/php.ini-production:1.12 Sun Jun 28 17:55:36 2009 >> +++ php-src/php.ini-production Tue Jun 30 08:49:05 2009 >> @@ -641,7 +641,7 @@ >> ; Data Handling ; >> ; >> -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 >> +; Note - track_vars is ALWAYS enabled > > Isn't that note kinda useless anyway. I don't even know what that > "track_vars" is supposed to be..some PHP 3 thing? Good point. We should probably remove it before 5.3.1 -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /documentation ParallelExecutionStrategy.odp
zoe Tue Jun 30 09:41:23 2009 UTC Added files: /phpruntests/documentation ParallelExecutionStrategy.odp Log: parallel execution diagram http://cvs.php.net/viewvc.cgi/phpruntests/documentation/ParallelExecutionStrategy.odp?view=markup&rev=1.1 Index: phpruntests/documentation/ParallelExecutionStrategy.odp +++ phpruntests/documentation/ParallelExecutionStrategy.odp PK &Ø5ÜÑp8öͳ%½=+¾åDbnGgÅ#D£q>GÈ>H¸øI¹|DqBaäîZXÄ'þùý»Ñ§è L.»$efDJhçU Ë`!`o,[ ÛP+ô¡þ)J¥lÝP&úçØþ6O'²R)À (ÛwõFV®sÔ¹%±Ú KwIØ"%Y1öf(KÙ©§¯`9üås,ϳ|Çã¯ãÏfíj¡EÝvw¹;p§ùñ=ýùû;ã{ôL|_ÉñìÇg,Ùçpr *Ýæøz?vØЧW±ùж q¤Öpë0̬ÜæèTÒ}ÞÖq£û¼)âk0Z¹¦·¦7£ÙøK!$IövÅúÊùÐÚÁ¿ðÏØÚþ> 7íÑ5ÒQ~jù®¨ÇnbK /¹ÛÒÑWÆõ cF±±LÒ:"GÆqíRºGå-V Sîµ}} ½1x£ÉиGî^$CÞyãÉд7ÂÉϬ?~^h¾ë¡ñÍÓózy:öFÑäëJÔVwy`öO¾c);V,Þ×vͼ|£ëzuoo*ܲÒç`p]wêhýjf·...@¡y^ðÛ5ö ·Ð×õõeG£F¨z(Ú«×ðÒ\°ì }Ç«÷Z´úq7jöÂc0ÓÏ¥?ååªÛ³ éêB=muÞ9áÐûèÑIÐáiÐuÝRÝj̽ñ|\Ãô5øÊ°oÅvg,UfB$fí~(K«GnàR¯4ª È/õÙ½Ëw06z-ÿ×üp8Æ1ä欰ÃÌAW¿ðG $ÙZô¿zí¤XnXìÌáòa1¼ð/?bN¤CQnè^/&â±ëDþÑÊù׺äfánvwìdÁÐSËË ar£ í¬ár²å'XT U/KÌlrpä|r&¾ÿµÀ6öãRe^¿ª)aÛ°xôâ~0Ä£p^ýªÍzí$¥zrm²xg´¤½Ìùcn0³c.¤ºxn¸y^hçâíé\ª°û...@¿yÅÿº$7Áø0ÚÙâ`:²ã`lEAxe Üà,zÃaÐ r/O,ÛBïn>·Ì®òÛ,¼iíÆnjö·Ú5½åplÖ7Ùf/qθÉaÜîÕÉùÒ~/9^gBb6u,×ù7sM?ÂPU«üf>§4y6üF2}¨wBñÛ×}Lù5Ce×1O6¾ðѯܫ$F«øp嶩 úÏ:¡w7n&/f8³O#o4©çêk¥àèK¥"!Le¤H³â®!fÏÏãË&M½Ù!+¶^-ÖQèÙa<CmÑsàÍëÏfWN¡Þ0zøÚë(ý£ÕõÛË[I(r_`©ÄG_¥LUÅõvæ%µ(d%ªß¨bý¯/ÿPK¦ÈMõ öõ²ïl]/ûí;Ûi\4Ýén*ºÃ÷õAzh_sñU¾|>ÛUìw½n[Êݨ³´5ß? Ã\TÜNv"®¦(ÆþæZZb7 1×ÜnmnÏÎý:ÐP;uZHð|®·ïzµFmngèq[ÎT[ä\±:Îü.u·Ï°AöñüßàiþS§ù ïæÅ §Ãק¹2Sf2ÓZ¬ÏWQ¤â²¦ü>_<¢ÓÎ;pôsÑ...@z¾=Í÷1®=ÏÚf ¤Lb¤Tºh UعJàIðrà:0¤MÀ5æÒ U?Í×<Õ#¥m rjI»vÕ`k@>TòC]Þ¥tUíB´(¹1Îx"WÁ l¼æ: Gt£!°hV+oõªh{L <º$rs;ôBäòÒø4Ù T¢ Å¿(LþúÙE^(>ûcwGK*ÐÒ¨2ö8ôAPh¹©ÜÁ]¼ï¸¿#T4#JIýìQ H4FÂüýçº["{A&é/ð7ðÏãìBf=·$ ~UÖ¬þ,1×5 ¢3#`Ògu¿¿¾fUL¬&X' |½J£¼o£Nyfò&µzåµ5åuD·³æifü¤¥Þ IAàØ_Êì7oÚħ I~Ç× =סÞ!{wðR¤Ø~¡þòg>ã¼ygyÇ]«õ6²...@çi¡Ï-Ýqm]çëy¹yi.©eÙöng¦e¼Ù?Àwpµ%¾w±Ó¯%uuÜ¥¸¦r»ûwcq= =ÚXÚ=¦3ZËÑB4§?i·6Oóÿý÷ßó&ÿXv~ßÐ{ó·¡7ïã;©?3?Ð&ne´KÊpáT"}Ȳ&m!Ú3A<+<¤ÆwÉ[Ô'·T\¹øé!¤ÊÚC"d ù-CHDh5BúCâ³õÓæ`ê§zL?*A´üX«fÑÔ¢)(je>нQ$²Ç ÓPŬ0¥4Ô(åQ+&üÅÒþª¢üÀ° 6%Ê°rÜîCpu ÿA/ÔxT¹á1Åâä·âªé!ûÄx|...@ºâw0 ªÉZÉûÀ;£Åb<{...@*¾guÚØd×c³¦(...@!áÇbÁá+ɴȹ^+ná£[täh&%»~t 4éÔ~O8ïxqâ»9Whü4f¹ÞQuJ«õ³s<}î`ÜtVÞ$å6tÞÆ´}wÄV·òn½µúí Óðý´kÚEÑG»G« ÖݽõWî}FS²{- 9$;i)Õ×:.ÇSÜÆÞWð¾÷ B÷¼¯à}ï;.B÷¼ï´xß"1Ò1¶qSîhTj½¢R¬:NA %]zØVtÎ`õ 1ñp¬ÁúA#¾áXë!ñ3P©8êq#bµü+¾ä"/[Âç\årôܺÝ|äèYdM¬=W^ÉPg¹Ï)¿H &öíáئÛüSv² êÏ1Ê«ò±ò©<Ó%æ5o`xéÃÀ®õ]o#J»Â®7ÀÞimå¿òÝ{meñsÔ×Ân »Þvö$ã6ص`¯|g¼öå0°ý`ÀÖÕ újÐ�...@_±óüÈ°¯}Õvsõ#ÃnûºìÖêgÝv³ìª2Ä:aÜy¥ì¡ä7Ua(~ú¬üªa?Á·ÞD°á!ôP<9+TÐâ§ù Ðû%{Ùo°²²$_:Ä¿ß0w°6ôì7cNV²ªäeÙg]Tξrxh<ÕÈ"X²¹ÒÇ¡<h»®jãÄ"GbÊ#±Sw$Æ¡<WÉ°hwi¨A¸Û¹6óÉó'öFÍm)«ÈVzwøõ2¯iÓöÇ¡XÜåÀ¹D³èc³â "ÇÀpÑzÆnÈÓÜCà'6x*§ ®Éqä¶Þ$üÙó7kìÂ0½ÐÜ>ÅÈ*Ô6t@ ¥Ô%_Qéubi÷zàÚoÒà?¬;T õ)7Ís$~Vªô7=tï½¾tÆÛ÷ÚwÕÐ)ÿÎÈDUkèUONÅF ÃêÅO& ÙÓ*neÿïÅг¨'`_«³(cúñ}>s×PÛfÔWæ$ÚëiÆ×êz7 ØC|ªúcSUïÎ ,Ì»T[,üÉ]áâ׬èQÜ¥j²iåì.UVÈÃß,OLáRÄÈÿØHú`g¹¶á+'EAKùkô ¹ÁfÙ¯µ8�...@Úð ¯K´ø÷<æ+-]ûtÕM£ºU Kr½¸&kËF¯N2ÿý3ûêGÁWhÙóÊúÊàmE.ìYUåf2ÜÃ)e!»?ãSny&±_ S/·Ò '²\wküÀ½2}$ÓÒLYS'À_Ö쫱i,[êº5\ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" office:version="1.1">OpenOffice.org/2.4$Linux OpenOffice.org_project/680m17$Build-9310zoe2009-06-30T10:24:54zoe2009-06-30T10:40:041PT0SPK HÂ2tw´t(1ôC#04HÄÐ]ÒC Ñÿïι8Wçê<çf={¯g}±¾÷ýÖ»÷ÒTW &xB àضbùÕh¿ÞûaétÏ8Ìpk1o_«:͹÷ÙήwjÏ~;âØrа?èî §Ôµ÷ßxZ{³|׶KÞÝîïAI_f;Qäô#F4Oíïo/F·¾%K¡ªãyíÒýƺ#ë÷ûË&w'éÝ÷&·{ºé ¸$8I"n¨?!ëË7c/-úïî.Ú.Ú.Zk3ÚD2żAüñ.NåK¾HûxÔ³bj,¯z vÚù;j#÷w&´ í½p+ÏytJ!sIûÑg>±ß?>zuâÆb{¯[~...@v¶tî}mwf¬r<%Çí¦ç¸:dpéSÆ¥GîN»WÂ(Ôû%/;IÃ?´x:ü@|Sÿ(¾oFJHZá`çy §Ø¬ê}5NUZûQái×׳¶ÓìCx¡]mçN{á?Äo£q¼¿½Ú[¶y[öÉQõfÝáûBíWj_Û-~óíø©>I±1ò®0¤Ýø.SórTü¥ß®IFÀy ñàßÝBÄÉæà©Ïéü|ÏvºÏH³Ô8;`G³évhî§*Ø|ëÑW!yôS5¨u¦õwê¤I j4HؤɴÕ5ö¡¶%'Û ¡&¼-Ü4 ÒäÞ׻ѹcÕñz,ÅÛ´E±±¬&´Òúg´Gmº¬ÊuóºÏOß[ù}S²ºèóäß-mÝâ·ì
Re: [PHP-CVS] cvs: php-src / php.ini-development php.ini-production
Hannes Magnusson wrote: bjori Tue Jun 30 08:49:05 2009 UTC Modified files: /php-src php.ini-production php.ini-development Log: MFB5.3: Add missing ini entries (Mikko) http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.12&r2=1.13&diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.12 php-src/php.ini-production:1.13 --- php-src/php.ini-production:1.12 Sun Jun 28 17:55:36 2009 +++ php-src/php.ini-production Tue Jun 30 08:49:05 2009 @@ -641,7 +641,7 @@ ; Data Handling ; ; -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 +; Note - track_vars is ALWAYS enabled Isn't that note kinda useless anyway. I don't even know what that "track_vars" is supposed to be..some PHP 3 thing? --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-development php.ini-production
bjori Tue Jun 30 08:49:05 2009 UTC Modified files: /php-srcphp.ini-production php.ini-development Log: MFB5.3: Add missing ini entries (Mikko) http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.12&r2=1.13&diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.12 php-src/php.ini-production:1.13 --- php-src/php.ini-production:1.12 Sun Jun 28 17:55:36 2009 +++ php-src/php.ini-production Tue Jun 30 08:49:05 2009 @@ -641,7 +641,7 @@ ; Data Handling ; ; -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 +; Note - track_vars is ALWAYS enabled ; The separator used in PHP generated URLs to separate arguments. ; PHP's default setting is "&". @@ -763,7 +763,7 @@ ; http://php.net/auto-append-file auto_append_file = -; As of 4.0b4, PHP always outputs a character encoding by default in +; By default, PHP will output a character encoding using ; the Content-type: header. To disable sending of the charset, simply ; set it to be empty. ; @@ -958,7 +958,6 @@ ;extension=php_interbase.dll ;extension=php_ldap.dll ;extension=php_mbstring.dll -;extension=php_mime_magic.dll ;extension=php_ming.dll ;extension=php_mssql.dll ;extension=php_mysql.dll @@ -1449,7 +1448,7 @@ ; where data files are stored. Note: Windows users have to change this ; variable in order to use PHP's session functions. ; -; As of PHP 4.0.1, you can define the path as: +; The path can be defined as: ; ; session.save_path = "N;/path" ; @@ -1876,6 +1875,20 @@ ; Sets the maximum number of open links or -1 for unlimited. ldap.max_links = -1 +[mcrypt] +; For more information about mcrypt settings see http://php.net/mcrypt-module-open + +; Directory where to load mcrypt algorithms +; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt) +;mcrypt.algorithms_dir= + +; Directory where to load mcrypt modes +; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt) +;mcrypt.modes_dir= + +[dba] +;dba.default_handler= + ; Local Variables: ; tab-width: 4 ; End: http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.13&r2=1.14&diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.13 php-src/php.ini-development:1.14 --- php-src/php.ini-development:1.13Sun Jun 28 17:55:36 2009 +++ php-src/php.ini-development Tue Jun 30 08:49:05 2009 @@ -641,7 +641,7 @@ ; Data Handling ; ; -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 +; Note - track_vars is ALWAYS enabled ; The separator used in PHP generated URLs to separate arguments. ; PHP's default setting is "&". @@ -763,7 +763,7 @@ ; http://php.net/auto-append-file auto_append_file = -; As of 4.0b4, PHP always outputs a character encoding by default in +; By default, PHP will output a character encoding using ; the Content-type: header. To disable sending of the charset, simply ; set it to be empty. ; @@ -958,7 +958,6 @@ ;extension=php_interbase.dll ;extension=php_ldap.dll ;extension=php_mbstring.dll -;extension=php_mime_magic.dll ;extension=php_ming.dll ;extension=php_mssql.dll ;extension=php_mysql.dll @@ -1441,7 +1440,7 @@ ; where data files are stored. Note: Windows users have to change this ; variable in order to use PHP's session functions. ; -; As of PHP 4.0.1, you can define the path as: +; The path can be defined as: ; ; session.save_path = "N;/path" ; @@ -1868,6 +1867,19 @@ ; Sets the maximum number of open links or -1 for unlimited. ldap.max_links = -1 +[mcrypt] +; For more information about mcrypt settings see http://php.net/mcrypt-module-open + +; Directory where to load mcrypt algorithms +; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt) +;mcrypt.algorithms_dir= + +; Directory where to load mcrypt modes +; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt) +;mcrypt.modes_dir= + +[dba] +;dba.default_handler= ; Local Variables: ; tab-width: 4 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php