cvs: php-src(PHP_5_2) / NEWS /ext/iconv iconv.c /ext/standard basic_functions.c /main php.h ZendEngine2 zend_API.h

bjori Wed Dec 20 10:34:37 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/main php.h /ZendEngine2 zend_API.h /php-src/ext/standard basic_functions.c /php-src/ext/iconv iconv.c /php-src NEWS Log: - Fixed incorrect function names on FreeBSD where inet_pton() was named __inet_pton() and inet_ntop() was named __inet_ntop() - Fixed bug #39685 (iconv() - undefined function) - Fixed bug #38852 (XML-RPC Breaks iconv) http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.221.2.4.2.5&r2=1.221.2.4.2.6&diff_format=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.221.2.4.2.5 php-src/main/php.h:1.221.2.4.2.6 --- php-src/main/php.h:1.221.2.4.2.5 Fri Nov 17 11:40:52 2006 +++ php-src/main/php.h Wed Dec 20 10:34:36 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.221.2.4.2.5 2006/11/17 11:40:52 dmitry Exp $ */ +/* $Id: php.h,v 1.221.2.4.2.6 2006/12/20 10:34:36 bjori Exp $ */ #ifndef PHP_H #define PHP_H @@ -340,6 +340,7 @@ #define PHP_FUNCTION ZEND_FUNCTION #define PHP_METHOD ZEND_METHOD +#define PHP_RAW_NAMED_FE ZEND_RAW_NAMED_FE #define PHP_NAMED_FE ZEND_NAMED_FE #define PHP_FE ZEND_FE #define PHP_DEP_FE ZEND_DEP_FE http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.207.2.8.2.5&r2=1.207.2.8.2.6&diff_format=u Index: ZendEngine2/zend_API.h diff -u ZendEngine2/zend_API.h:1.207.2.8.2.5 ZendEngine2/zend_API.h:1.207.2.8.2.6 --- ZendEngine2/zend_API.h:1.207.2.8.2.5 Tue Jul 18 09:06:32 2006 +++ ZendEngine2/zend_API.h Wed Dec 20 10:34:36 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.h,v 1.207.2.8.2.5 2006/07/18 09:06:32 dmitry Exp $ */ +/* $Id: zend_API.h,v 1.207.2.8.2.6 2006/12/20 10:34:36 bjori Exp $ */ #ifndef ZEND_API_H #define ZEND_API_H @@ -48,6 +48,9 @@ #define ZEND_FENTRY(zend_name, name, arg_info, flags) { #zend_name, name, arg_info, (zend_uint) (sizeof(arg_info)/sizeof(struct _zend_arg_info)-1), flags }, +#define ZEND_RAW_FENTRY(zend_name, name, arg_info, flags) { zend_name, name, arg_info, (zend_uint) (sizeof(arg_info)/sizeof(struct _zend_arg_info)-1), flags }, +#define ZEND_RAW_NAMED_FE(zend_name, name, arg_info) ZEND_RAW_FENTRY(#zend_name, name, arg_info, 0) + #define ZEND_NAMED_FE(zend_name, name, arg_info) ZEND_FENTRY(zend_name, name, arg_info, 0) #define ZEND_FE(name, arg_info) ZEND_FENTRY(name, ZEND_FN(name), arg_info, 0) #define ZEND_DEP_FE(name, arg_info) ZEND_FENTRY(name, ZEND_FN(name), arg_info, ZEND_ACC_DEPRECATED) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.36&r2=1.725.2.31.2.37&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.36 php-src/ext/standard/basic_functions.c:1.725.2.31.2.37 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.36 Tue Dec 19 08:58:58 2006 +++ php-src/ext/standard/basic_functions.c Wed Dec 20 10:34:36 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.36 2006/12/19 08:58:58 dmitry Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.37 2006/12/20 10:34:36 bjori Exp $ */ #include "php.h" #include "php_streams.h" @@ -3334,10 +3334,10 @@ PHP_FE(number_format, arginfo_number_format) PHP_FE(fmod, arginfo_fmod) #ifdef HAVE_INET_NTOP - PHP_NAMED_FE(inet_ntop, php_inet_ntop, arginfo_inet_ntop) + PHP_RAW_NAMED_FE(inet_ntop, php_inet_ntop, arginfo_inet_ntop) #endif #ifdef HAVE_INET_PTON - PHP_NAMED_FE(inet_pton, php_inet_pton, arginfo_inet_pton) + PHP_RAW_NAMED_FE(inet_pton, php_inet_pton, arginfo_inet_pton) #endif PHP_FE(ip2long, arginfo_ip2long) PHP_FE(long2ip, arginfo_long2ip) http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.124.2.8.2.8&r2=1.124.2.8.2.9&diff_format=u Index: php-src/ext/iconv/iconv.c diff -u php-src/ext/iconv/iconv.c:1.124.2.8.2.8 php-src/ext/iconv/iconv.c:1.124.2.8.2.9 --- php-src/ext/iconv/iconv.c:1.124.2.8.2.8 Wed Nov 15 18:34:57 2006 +++ php-src/ext/iconv/iconv.c Wed Dec 20 10:34:36 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: iconv.c,v 1.124.2.8.2.8 2006/11/15 18:34:57 iliaa Exp $ */ +/* $Id: iconv.c,v 1.124.2.8.2.9 2006/12/20 10:34:36 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -142,7 +142,7 @@ /* {{{ iconv_functions[] */ zend_function_entry iconv_functions[] = { - PHP_NAMED_FE(iconv,php_if_iconv, arginfo_iconv) + PHP_RAW_NAMED_FE(iconv,php_if_iconv, arginfo_iconv) PHP_FE(ob_iconv_handler, arginfo_ob_iconv_handler) PHP_FE(iconv_get_encoding, arginfo_iconv_get_encoding) PHP_FE(iconv_set_encoding, arginfo_iconv_set_encoding) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.443&r2=1.2027.2.547.2.444&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.443 php-src/NEWS:1.2027.2.547.2.444 --- php-src/NEWS:1.2027.2.547.2.443 Tue Dec 19 11:54:37 2006 +++ php-src/NEWS Wed Dec 20 10:34:36 2006 @@ -8,6 +8,9 @@ . cookies . canary protection (debug build only) . random generation of cookies and canaries +- Fixed incorrect function names on FreeBSD where inet_pton() was named + __inet_pton() and inet_ntop() was named __inet_ntop() (Hannes) + - Fixed bug #39869 (safe_read does not initialize errno). (michiel at boland dot org, Dmitry) - Fixed bug #39850 (SplFileObject throws contradictory/wrong error messages @@ -15,6 +18,8 @@ - Fixed bug #39832 (SOAP Server: parameter not matching the WSDL specified type are set to 0). (Dmitry) - Fixed bug #39815 (SOAP double encoding is not locale-independent). (Dmitry) +- Fixed bug #39685 (iconv() - undefined function). (Hannes) +- Fixed bug #38852 (XML-RPC Breaks iconv). (Hannes) 14 Dec 2006, PHP 5.2.1RC1 - Added a meta tag to phpinfo() output to prevent search engines from indexing