Skip to content
Browse files

- 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)
  • Loading branch information...
1 parent 6a8a2e8 commit 1e19ee87853fe519cee671038bd5eba0fe9cd8be @bjori bjori committed Dec 20, 2006
Showing with 12 additions and 3 deletions.
  1. +5 −0 NEWS
  2. +3 −0 Zend/zend_API.h
  3. +1 −1 ext/iconv/iconv.c
  4. +2 −2 ext/standard/basic_functions.c
  5. +1 −0 main/php.h
View
5 NEWS
@@ -8,13 +8,18 @@ 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
when trying to open "php://wrong"). (Tony)
- 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
View
3 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)
View
2 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)
View
4 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)
View
1 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

0 comments on commit 1e19ee8

Please sign in to comment.
Something went wrong with that request. Please try again.