- 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)

diff --git a/NEWS b/NEWS
index 8c80bb882f5a55607a1f7a464c5178c40fbcba80..d01437f10fbc317c17267d46fa28f1a47ff271cf 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,9 @@ PHP                                                                        NEWS
   . 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 @@ PHP                                                                        NEWS
 - 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 

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index b69aa4b34d6a8c7069188b377590513341cc6c2e..891c5904badd60e383ebaa1acda2eda563a04269 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -48,6 +48,9 @@ typedef struct _zend_function_entry {
 
 #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)

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index e6840e8f41f4e11f50e05d8d06fef4372f4bbf01..9cfdf8bebb72769817296bcd8003adf4e23d71fd 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -142,7 +142,7 @@ ZEND_END_ARG_INFO()
 /* {{{ 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)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index fec5918e15f61692aea81e1e6a4746b62613a817..3bb2c8f9c36339b4281dca0bd84b335831372721 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3334,10 +3334,10 @@ zend_function_entry basic_functions[] = {
        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)

diff --git a/main/php.h b/main/php.h
index a3825a46599e83c44d81bf877bc1e63f3ec4fe44..59e9762ac110c687b3e7e5183827fa4a9c5ddf0e 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -340,6 +340,7 @@ END_EXTERN_C()
 #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