[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed Jul 5 01:30:52 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2381r2=1.2382diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2381 php-src/ChangeLog:1.2382 --- php-src/ChangeLog:1.2381Tue Jul 4 01:30:51 2006 +++ php-src/ChangeLog Wed Jul 5 01:30:51 2006 @@ -1,3 +1,40 @@ +2006-07-04 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/curl/interface.c: + MFB: Eliminate some compiler warnings + +* (PHP_5_2) + ext/curl/interface.c: + Eliminate some compiler warnings + +2006-07-04 Derick Rethans [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + - MFH: Updated timezonedb to version 2006.7. + - MFH: Fixed test cases because of new constant values for the formats. + +* (PHP_4_4) + NEWS + configure.in + main/php_version.h: + - Back to dev. + +* (PHP_4_4) + NEWS + configure.in + main/php_version.h: + - Go with RC2. + +2006-07-04 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + main/php_ini.c + main/php_ini.c: + Changed priority of PHPRC environment variable on win32 to be higher then + value from registry. + 2006-07-03 Hannes Magnusson [EMAIL PROTECTED] * (PHP_5_2)
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main php_ini.c
dmitry Tue Jul 4 06:35:49 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/main php_ini.c Log: Changed priority of PHPRC environment variable on win32 to be higher then value from registry. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.103r2=1.2027.2.547.2.104diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.103 php-src/NEWS:1.2027.2.547.2.104 --- php-src/NEWS:1.2027.2.547.2.103 Mon Jul 3 16:55:57 2006 +++ php-src/NEWSTue Jul 4 06:35:49 2006 @@ -3,6 +3,8 @@ ?? ??? 2006, PHP 5.2.0 - Reimplementation of Apache2Filter, PHP can now be an arbitrary filter in the chain and will read the script from the Apache stream. (John) +- Changed priority of PHPRC environment variable on win32 to be higher then + value from registry. (Dmitry) - Changed __toString() to be called wherever applicable. (Marcus) - Changed E_ALL error reporting mode to include E_RECOVERABLE_ERROR. (Marcus) - Changed realpath cache to be disabled when open_basedir or safe_mode http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4r2=1.136.2.4.2.1diff_format=u Index: php-src/main/php_ini.c diff -u php-src/main/php_ini.c:1.136.2.4 php-src/main/php_ini.c:1.136.2.4.2.1 --- php-src/main/php_ini.c:1.136.2.4Sun Jan 1 12:50:17 2006 +++ php-src/main/php_ini.c Tue Jul 4 06:35:49 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_ini.c,v 1.136.2.4 2006/01/01 12:50:17 sniper Exp $ */ +/* $Id: php_ini.c,v 1.136.2.4.2.1 2006/07/04 06:35:49 dmitry Exp $ */ #include php.h #include ext/standard/info.h @@ -310,6 +310,14 @@ free_ini_search_path = 1; php_ini_search_path[0] = 0; + /* Add environment location */ + if (env_location[0]) { + if (*php_ini_search_path) { + strcat(php_ini_search_path, paths_separator); + } + strcat(php_ini_search_path, env_location); + } + #ifdef PHP_WIN32 /* Add registry location */ reg_location = GetIniPathFromRegistry(); @@ -322,14 +330,6 @@ } #endif - /* Add environment location */ - if (env_location[0]) { - if (*php_ini_search_path) { - strcat(php_ini_search_path, paths_separator); - } - strcat(php_ini_search_path, env_location); - } - /* Add cwd (only with CLI) */ if (strcmp(sapi_module.name, cli) == 0) { if (*php_ini_search_path) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_ini.c
dmitry Tue Jul 4 06:38:32 2006 UTC Modified files: /php-src/main php_ini.c Log: Changed priority of PHPRC environment variable on win32 to be higher then value from registry. http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.142r2=1.143diff_format=u Index: php-src/main/php_ini.c diff -u php-src/main/php_ini.c:1.142 php-src/main/php_ini.c:1.143 --- php-src/main/php_ini.c:1.142Wed Mar 8 14:41:45 2006 +++ php-src/main/php_ini.c Tue Jul 4 06:38:32 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_ini.c,v 1.142 2006/03/08 14:41:45 iliaa Exp $ */ +/* $Id: php_ini.c,v 1.143 2006/07/04 06:38:32 dmitry Exp $ */ #include php.h #include ext/standard/info.h @@ -308,6 +308,14 @@ free_ini_search_path = 1; php_ini_search_path[0] = 0; + /* Add environment location */ + if (env_location[0]) { + if (*php_ini_search_path) { + strcat(php_ini_search_path, paths_separator); + } + strcat(php_ini_search_path, env_location); + } + #ifdef PHP_WIN32 /* Add registry location */ reg_location = GetIniPathFromRegistry(); @@ -320,14 +328,6 @@ } #endif - /* Add environment location */ - if (env_location[0]) { - if (*php_ini_search_path) { - strcat(php_ini_search_path, paths_separator); - } - strcat(php_ini_search_path, env_location); - } - /* Add cwd (only with CLI) */ if (strcmp(sapi_module.name, cli) == 0) { if (*php_ini_search_path) { -- 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/libxml libxml.c
dmitry Tue Jul 4 07:26:53 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/libxml libxml.c Log: Fixed memory leak http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.4r2=1.32.2.7.2.5diff_format=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.4 php-src/ext/libxml/libxml.c:1.32.2.7.2.5 --- php-src/ext/libxml/libxml.c:1.32.2.7.2.4Mon Jun 26 14:11:17 2006 +++ php-src/ext/libxml/libxml.c Tue Jul 4 07:26:53 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: libxml.c,v 1.32.2.7.2.4 2006/06/26 14:11:17 bjori Exp $ */ +/* $Id: libxml.c,v 1.32.2.7.2.5 2006/07/04 07:26:53 dmitry Exp $ */ #define IS_EXT_MODULE @@ -657,6 +657,10 @@ xmlParserInputBufferCreateFilenameDefault(NULL); xmlOutputBufferCreateFilenameDefault(NULL); + if (LIBXML(stream_context)) { + zval_ptr_dtor(LIBXML(stream_context)); + LIBXML(stream_context) = NULL; + } smart_str_free(LIBXML(error_buffer)); if (LIBXML(error_list)) { zend_llist_destroy(LIBXML(error_list)); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
dmitry Tue Jul 4 07:34:32 2006 UTC Modified files: /php-src/ext/libxml libxml.c Log: Fixed memory leak http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.49r2=1.50diff_format=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.49 php-src/ext/libxml/libxml.c:1.50 --- php-src/ext/libxml/libxml.c:1.49Mon Jun 26 14:10:57 2006 +++ php-src/ext/libxml/libxml.c Tue Jul 4 07:34:32 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: libxml.c,v 1.49 2006/06/26 14:10:57 bjori Exp $ */ +/* $Id: libxml.c,v 1.50 2006/07/04 07:34:32 dmitry Exp $ */ #define IS_EXT_MODULE @@ -657,6 +657,10 @@ xmlParserInputBufferCreateFilenameDefault(NULL); xmlOutputBufferCreateFilenameDefault(NULL); + if (LIBXML(stream_context)) { + zval_ptr_dtor(LIBXML(stream_context)); + LIBXML(stream_context) = NULL; + } smart_str_free(LIBXML(error_buffer)); if (LIBXML(error_list)) { zend_llist_destroy(LIBXML(error_list)); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
bjori Tue Jul 4 15:37:13 2006 UTC Modified files: /php-src/ext/reflection php_reflection.c Log: Obs. ZEND_BEGIN_ARG_INFO = ZEND_BEGIN_ARG_INFO_EX http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.238r2=1.239diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.238 php-src/ext/reflection/php_reflection.c:1.239 --- php-src/ext/reflection/php_reflection.c:1.238 Tue Jul 4 15:33:32 2006 +++ php-src/ext/reflection/php_reflection.c Tue Jul 4 15:37:13 2006 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.238 2006/07/04 15:33:32 bjori Exp $ */ +/* $Id: php_reflection.c,v 1.239 2006/07/04 15:37:13 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -4499,7 +4499,7 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_getProperties, 0, 0, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_getProperties, 0, 0, 0) ZEND_ARG_INFO(0, filter) ZEND_END_ARG_INFO() @@ -4818,7 +4818,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Reflection, enabled); - php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.238 2006/07/04 15:33:32 bjori Exp $); + php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.239 2006/07/04 15:37:13 bjori Exp $); php_info_print_table_end(); } /* }}} */ -- 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/reflection php_reflection.c
bjori Tue Jul 4 15:37:34 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/reflection php_reflection.c Log: mfh http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.9r2=1.164.2.33.2.10diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.9 php-src/ext/reflection/php_reflection.c:1.164.2.33.2.10 --- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.9 Tue Jul 4 15:33:57 2006 +++ php-src/ext/reflection/php_reflection.c Tue Jul 4 15:37:34 2006 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.164.2.33.2.9 2006/07/04 15:33:57 bjori Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.33.2.10 2006/07/04 15:37:34 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -4428,7 +4428,7 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_getProperties, 0, 0, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_getProperties, 0, 0, 0) ZEND_ARG_INFO(0, filter) ZEND_END_ARG_INFO() @@ -4750,7 +4750,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Reflection, enabled); - php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.164.2.33.2.9 2006/07/04 15:33:57 bjori Exp $); + php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.164.2.33.2.10 2006/07/04 15:37:34 bjori Exp $); php_info_print_table_end(); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
bjori Tue Jul 4 15:33:32 2006 UTC Modified files: /php-src/ext/reflection php_reflection.c Log: Fix protosarginfo http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.237r2=1.238diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.237 php-src/ext/reflection/php_reflection.c:1.238 --- php-src/ext/reflection/php_reflection.c:1.237 Sat Jun 24 18:53:51 2006 +++ php-src/ext/reflection/php_reflection.c Tue Jul 4 15:33:32 2006 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.237 2006/06/24 18:53:51 helly Exp $ */ +/* $Id: php_reflection.c,v 1.238 2006/07/04 15:33:32 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -2969,7 +2969,7 @@ } /* }}} */ -/* {{{ proto public ReflectionMethod[] ReflectionClass::getMethods() +/* {{{ proto public ReflectionMethod[] ReflectionClass::getMethods([long $filter]) Returns an array of this class' methods */ ZEND_METHOD(reflection_class, getMethods) { @@ -3134,7 +3134,7 @@ } /* }}} */ -/* {{{ proto public ReflectionProperty[] ReflectionClass::getProperties() +/* {{{ proto public ReflectionProperty[] ReflectionClass::getProperties([long $filter]) Returns an array of this class' properties */ ZEND_METHOD(reflection_class, getProperties) { @@ -3383,7 +3383,7 @@ } /* }}} */ -/* {{{ proto public stdclass ReflectionClass::newInstanceArgs(array args) +/* {{{ proto public stdclass ReflectionClass::newInstanceArgs([array args]) Returns an instance of this class */ ZEND_METHOD(reflection_class, newInstanceArgs) { @@ -4484,6 +4484,11 @@ ZEND_END_ARG_INFO() static +ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_getMethods, 0, 0, 0) + ZEND_ARG_INFO(0, $filter) +ZEND_END_ARG_INFO() + +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_hasProperty, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() @@ -4494,6 +4499,11 @@ ZEND_END_ARG_INFO() static +ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_getProperties, 0, 0, 0) + ZEND_ARG_INFO(0, filter) +ZEND_END_ARG_INFO() + +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_hasConstant, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() @@ -4514,7 +4524,7 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_newInstanceArgs, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_newInstanceArgs, 0, 0, 0) ZEND_ARG_ARRAY_INFO(0, args, 0) ZEND_END_ARG_INFO() @@ -4544,10 +4554,10 @@ ZEND_ME(reflection_class, getConstructor, NULL, 0) ZEND_ME(reflection_class, hasMethod, arginfo_reflection_class_hasMethod, 0) ZEND_ME(reflection_class, getMethod, arginfo_reflection_class_getMethod, 0) - ZEND_ME(reflection_class, getMethods, NULL, 0) + ZEND_ME(reflection_class, getMethods, arginfo_reflection_class_getMethods, 0) ZEND_ME(reflection_class, hasProperty, arginfo_reflection_class_hasProperty, 0) ZEND_ME(reflection_class, getProperty, arginfo_reflection_class_getProperty, 0) - ZEND_ME(reflection_class, getProperties, NULL, 0) + ZEND_ME(reflection_class, getProperties, arginfo_reflection_class_getProperties, 0) ZEND_ME(reflection_class, hasConstant, arginfo_reflection_class_hasConstant, 0) ZEND_ME(reflection_class, getConstants, NULL, 0) ZEND_ME(reflection_class, getConstant, arginfo_reflection_class_getConstant, 0) @@ -4808,7 +4818,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Reflection, enabled); - php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.237 2006/06/24 18:53:51 helly Exp $); + php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.238 2006/07/04 15:33:32 bjori Exp $); php_info_print_table_end(); } /* }}} */ -- 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/reflection php_reflection.c
bjori Tue Jul 4 15:33:57 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/reflection php_reflection.c Log: MFH: Fix protosarginfo http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.8r2=1.164.2.33.2.9diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.8 php-src/ext/reflection/php_reflection.c:1.164.2.33.2.9 --- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.8 Sat Jun 24 18:55:15 2006 +++ php-src/ext/reflection/php_reflection.c Tue Jul 4 15:33:57 2006 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.164.2.33.2.8 2006/06/24 18:55:15 helly Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.33.2.9 2006/07/04 15:33:57 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -2944,7 +2944,7 @@ } /* }}} */ -/* {{{ proto public ReflectionMethod[] ReflectionClass::getMethods() +/* {{{ proto public ReflectionMethod[] ReflectionClass::getMethods([long $filter]) Returns an array of this class' methods */ ZEND_METHOD(reflection_class, getMethods) { @@ -3100,7 +3100,7 @@ } /* }}} */ -/* {{{ proto public ReflectionProperty[] ReflectionClass::getProperties() +/* {{{ proto public ReflectionProperty[] ReflectionClass::getProperties([long $filter]) Returns an array of this class' properties */ ZEND_METHOD(reflection_class, getProperties) { @@ -3349,7 +3349,7 @@ } /* }}} */ -/* {{{ proto public stdclass ReflectionClass::newInstanceArgs(array args) +/* {{{ proto public stdclass ReflectionClass::newInstanceArgs([array args]) Returns an instance of this class */ ZEND_METHOD(reflection_class, newInstanceArgs) { @@ -4413,6 +4413,11 @@ ZEND_END_ARG_INFO() static +ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_getMethods, 0, 0, 0) + ZEND_ARG_INFO(0, $filter) +ZEND_END_ARG_INFO() + +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_hasProperty, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() @@ -4423,6 +4428,11 @@ ZEND_END_ARG_INFO() static +ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_getProperties, 0, 0, 0) + ZEND_ARG_INFO(0, filter) +ZEND_END_ARG_INFO() + +static ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_hasConstant, 0) ZEND_ARG_INFO(0, name) ZEND_END_ARG_INFO() @@ -4443,7 +4453,7 @@ ZEND_END_ARG_INFO() static -ZEND_BEGIN_ARG_INFO(arginfo_reflection_class_newInstanceArgs, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_newInstanceArgs, 0, 0, 0) ZEND_ARG_ARRAY_INFO(0, args, 0) ZEND_END_ARG_INFO() @@ -4473,10 +4483,10 @@ ZEND_ME(reflection_class, getConstructor, NULL, 0) ZEND_ME(reflection_class, hasMethod, arginfo_reflection_class_hasMethod, 0) ZEND_ME(reflection_class, getMethod, arginfo_reflection_class_getMethod, 0) - ZEND_ME(reflection_class, getMethods, NULL, 0) + ZEND_ME(reflection_class, getMethods, arginfo_reflection_class_getMethods, 0) ZEND_ME(reflection_class, hasProperty, arginfo_reflection_class_hasProperty, 0) ZEND_ME(reflection_class, getProperty, arginfo_reflection_class_getProperty, 0) - ZEND_ME(reflection_class, getProperties, NULL, 0) + ZEND_ME(reflection_class, getProperties, arginfo_reflection_class_getProperties, 0) ZEND_ME(reflection_class, hasConstant, arginfo_reflection_class_hasConstant, 0) ZEND_ME(reflection_class, getConstants, NULL, 0) ZEND_ME(reflection_class, getConstant, arginfo_reflection_class_getConstant, 0) @@ -4740,7 +4750,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Reflection, enabled); - php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.164.2.33.2.8 2006/06/24 18:55:15 helly Exp $); + php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.164.2.33.2.9 2006/07/04 15:33:57 bjori Exp $); php_info_print_table_end(); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS configure.in /main php_version.h
derick Tue Jul 4 16:37:47 2006 UTC Modified files: (Branch: PHP_4_4) /php-srcNEWS configure.in /php-src/main php_version.h Log: - Go with RC2. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.138r2=1.1247.2.920.2.139diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.138 php-src/NEWS:1.1247.2.920.2.139 --- php-src/NEWS:1.1247.2.920.2.138 Wed Jun 28 22:12:54 2006 +++ php-src/NEWSTue Jul 4 16:37:46 2006 @@ -1,6 +1,6 @@ PHP 4 NEWS ||| -?? Jun 2006, Version 4.4.3RC2 +04 Jul 2006, Version 4.4.3RC2 - Improved safe_mode check for the error_log() function. (Ilia) - Fixed handling of extremely long paths inside tempnam() function. (Ilia) - Fixed XSS inside phpinfo() with long inputs. (Ilia) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.396.2.164.2.22r2=1.396.2.164.2.23diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.22 php-src/configure.in:1.396.2.164.2.23 --- php-src/configure.in:1.396.2.164.2.22 Sun May 21 17:26:13 2006 +++ php-src/configure.inTue Jul 4 16:37:46 2006 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.22 2006/05/21 17:26:13 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.23 2006/07/04 16:37:46 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=4 RELEASE_VERSION=3 -EXTRA_VERSION=RC2-dev +EXTRA_VERSION=RC2 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.66.2.81.2.20r2=1.66.2.81.2.21diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.20 php-src/main/php_version.h:1.66.2.81.2.21 --- php-src/main/php_version.h:1.66.2.81.2.20 Sun May 21 17:26:13 2006 +++ php-src/main/php_version.h Tue Jul 4 16:37:47 2006 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 3 -#define PHP_EXTRA_VERSION RC2-dev -#define PHP_VERSION 4.4.3RC2-dev +#define PHP_EXTRA_VERSION RC2 +#define PHP_VERSION 4.4.3RC2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS configure.in /main php_version.h
derick Tue Jul 4 16:40:24 2006 UTC Modified files: (Branch: PHP_4_4) /php-srcNEWS configure.in /php-src/main php_version.h Log: - Back to dev. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.139r2=1.1247.2.920.2.140diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.139 php-src/NEWS:1.1247.2.920.2.140 --- php-src/NEWS:1.1247.2.920.2.139 Tue Jul 4 16:37:46 2006 +++ php-src/NEWSTue Jul 4 16:40:23 2006 @@ -1,5 +1,7 @@ PHP 4 NEWS ||| +?? ??? 2006, Version 4.4.3 + 04 Jul 2006, Version 4.4.3RC2 - Improved safe_mode check for the error_log() function. (Ilia) - Fixed handling of extremely long paths inside tempnam() function. (Ilia) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.396.2.164.2.23r2=1.396.2.164.2.24diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.23 php-src/configure.in:1.396.2.164.2.24 --- php-src/configure.in:1.396.2.164.2.23 Tue Jul 4 16:37:46 2006 +++ php-src/configure.inTue Jul 4 16:40:23 2006 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.23 2006/07/04 16:37:46 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.24 2006/07/04 16:40:23 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=4 RELEASE_VERSION=3 -EXTRA_VERSION=RC2 +EXTRA_VERSION=RC3-dev VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.66.2.81.2.21r2=1.66.2.81.2.22diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.21 php-src/main/php_version.h:1.66.2.81.2.22 --- php-src/main/php_version.h:1.66.2.81.2.21 Tue Jul 4 16:37:47 2006 +++ php-src/main/php_version.h Tue Jul 4 16:40:23 2006 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 3 -#define PHP_EXTRA_VERSION RC2 -#define PHP_VERSION 4.4.3RC2 +#define PHP_EXTRA_VERSION RC3-dev +#define PHP_VERSION 4.4.3RC3-dev -- 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/curl interface.c
iliaa Tue Jul 4 20:12:38 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/curl interface.c Log: Eliminate some compiler warnings http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.5r2=1.62.2.14.2.6diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.5 php-src/ext/curl/interface.c:1.62.2.14.2.6 --- php-src/ext/curl/interface.c:1.62.2.14.2.5 Thu Jun 29 14:31:56 2006 +++ php-src/ext/curl/interface.cTue Jul 4 20:12:38 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.62.2.14.2.5 2006/06/29 14:31:56 bjori Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.6 2006/07/04 20:12:38 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -1268,11 +1268,13 @@ ZEND_VERIFY_RESOURCE(what); if (FAILURE == php_stream_cast((php_stream *) what, PHP_STREAM_AS_STDIO, (void *) fp, REPORT_ERRORS)) { - RETURN_FALSE; + RETVAL_FALSE; + return 1; } if (!fp) { - RETURN_FALSE; + RETVAL_FALSE; + return 1; } error = CURLE_OK; @@ -1367,7 +1369,8 @@ postfields = HASH_OF(*zvalue); if (! postfields) { php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't get HashTable in CURLOPT_POSTFIELDS); - RETURN_FALSE; + RETVAL_FALSE; + return 1; } for (zend_hash_internal_pointer_reset(postfields); @@ -1389,7 +1392,8 @@ ++postval; /* safe_mode / open_basedir check */ if (php_check_open_basedir(postval TSRMLS_CC) || (PG(safe_mode) !php_checkuid(postval, rb+, CHECKUID_CHECK_MODE_PARAM))) { - RETURN_FALSE; + RETVAL_FALSE; + return 1; } error = curl_formadd(first, last, CURLFORM_COPYNAME, string_key, @@ -1408,7 +1412,8 @@ SAVE_CURL_ERROR(ch, error); if (error != CURLE_OK) { - RETURN_FALSE; + RETVAL_FALSE + return 1; } zend_llist_add_element(ch-to_free.post, first); @@ -1436,7 +1441,8 @@ ph = HASH_OF(*zvalue); if (!ph) { php_error_docref(NULL TSRMLS_CC, E_WARNING, You must pass either an object or an array with the CURLOPT_HTTPHEADER, CURLOPT_QUOTE, CURLOPT_HTTP200ALIASES and CURLOPT_POSTQUOTE arguments); - RETURN_FALSE; + RETVAL_FALSE; + return 1; } for (zend_hash_internal_pointer_reset(ph); @@ -1453,7 +1459,8 @@ if (!slist) { efree(indiv); php_error_docref(NULL TSRMLS_CC, E_WARNING, Could not build curl_slist); - RETURN_FALSE; + RETVAL_FALSE; + return 1; } zend_llist_add_element(ch-to_free.str, indiv); } @@ -1475,7 +1482,8 @@ convert_to_string_ex(zvalue); if (php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC) || (PG(safe_mode) !php_checkuid(Z_STRVAL_PP(zvalue), rb+, CHECKUID_CHECK_MODE_PARAM))) { - RETURN_FALSE; + RETVAL_FALSE; + return 1; } copystr = estrndup(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue)); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
iliaa Tue Jul 4 20:13:40 2006 UTC Modified files: /php-src/ext/curl interface.c Log: MFB: Eliminate some compiler warnings http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.85r2=1.86diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.85 php-src/ext/curl/interface.c:1.86 --- php-src/ext/curl/interface.c:1.85 Thu Jun 29 14:32:24 2006 +++ php-src/ext/curl/interface.cTue Jul 4 20:13:40 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.85 2006/06/29 14:32:24 bjori Exp $ */ +/* $Id: interface.c,v 1.86 2006/07/04 20:13:40 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -1266,11 +1266,13 @@ ZEND_VERIFY_RESOURCE(what); if (FAILURE == php_stream_cast((php_stream *) what, PHP_STREAM_AS_STDIO, (void *) fp, REPORT_ERRORS)) { - RETURN_FALSE; + RETVAL_FALSE; + return 1; } if (!fp) { - RETURN_FALSE; + RETVAL_FALSE; + return 1; } error = CURLE_OK; @@ -1365,7 +1367,8 @@ postfields = HASH_OF(*zvalue); if (! postfields) { php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't get HashTable in CURLOPT_POSTFIELDS); - RETURN_FALSE; + RETVAL_FALSE; + return 1; } for (zend_hash_internal_pointer_reset(postfields); @@ -1387,7 +1390,8 @@ ++postval; /* open_basedir check */ if (php_check_open_basedir(postval TSRMLS_CC)) { - RETURN_FALSE; + RETVAL_FALSE; + return 1; } error = curl_formadd(first, last, CURLFORM_COPYNAME, string_key, @@ -1406,7 +1410,8 @@ SAVE_CURL_ERROR(ch, error); if (error != CURLE_OK) { - RETURN_FALSE; + RETVAL_FALSE + return 1; } zend_llist_add_element(ch-to_free.post, first); @@ -1434,7 +1439,8 @@ ph = HASH_OF(*zvalue); if (!ph) { php_error_docref(NULL TSRMLS_CC, E_WARNING, You must pass either an object or an array with the CURLOPT_HTTPHEADER, CURLOPT_QUOTE, CURLOPT_HTTP200ALIASES and CURLOPT_POSTQUOTE arguments); - RETURN_FALSE; + RETVAL_FALSE; + return 1; } for (zend_hash_internal_pointer_reset(ph); @@ -1451,7 +1457,8 @@ if (!slist) { efree(indiv); php_error_docref(NULL TSRMLS_CC, E_WARNING, Could not build curl_slist); - RETURN_FALSE; + RETVAL_FALSE; + return 1; } zend_llist_add_element(ch-to_free.str, indiv); } @@ -1473,7 +1480,8 @@ convert_to_string_ex(zvalue); if (php_check_open_basedir(Z_STRVAL_PP(zvalue) TSRMLS_CC)) { - RETURN_FALSE; + RETVAL_FALSE; + return 1; } copystr = estrndup(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue)); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php