MFB:

- 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/Zend/zend_API.h b/Zend/zend_API.h
index dcad49863306df46515f510589d61e6986aa86fc..87f52c9a3179483a7446a9dc659524fd895244c8 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 832d2dca76f6b26e2d3052b01a337d4c123ea7c8..9dd1881cfed9795d575e7343bfc446d95bd86705 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -136,7 +136,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(iconv_get_encoding,                                              arginfo_iconv_get_encoding)
        PHP_FE(iconv_set_encoding,                                              arginfo_iconv_set_encoding)
        PHP_FE(iconv_strlen,                                                    arginfo_iconv_strlen)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index b97a6106841f40df876b7ad9c09b50ca8690cefa..f29af4469d4c80d3853bc4aaf0e9d773252e22ab 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3378,10 +3378,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 84bf8927a4f1a5b7ae395b4bc638decfba7d6f0f..97049ead231726a2c6764391addcd3a149cdc92d 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -336,6 +336,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