Fixed bug #10964

diff --git a/configure.in b/configure.in
index 9c778fc202934dc894914eabe9e7d6a3c290efc3..4a2e341cef66634a68a5fc8539ee7eed3d6472c7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -370,6 +370,8 @@ getlogin \
 gethostbyaddr \
 getprotobyname \
 getprotobynumber \
+getservbyname \
+getservbyport \
 getrusage \
 gettimeofday \
 gmtime_r \

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 5f1fec4ece1482d282b7d2a45259cfd0ec128c4f..c55aa1d422a43cc8c4a02ef1870146599cc76b11 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -237,7 +237,10 @@ function_entry basic_functions[] = {
        PHP_FE(mt_rand,                                                                 NULL)
        PHP_FE(mt_srand,                                                                NULL)
        PHP_FE(mt_getrandmax,                                                   NULL)
+
+#if HAVE_GETSERVBYNAME
        PHP_FE(getservbyname, NULL)
+#endif
 #if HAVE_GETSERVBYPORT
        PHP_FE(getservbyport, NULL)
 #endif
@@ -247,6 +250,7 @@ function_entry basic_functions[] = {
 #if HAVE_GETPROTOBYNUMBER
        PHP_FE(getprotobynumber, NULL)
 #endif
+
        PHP_FE(gethostbyaddr,                                                   NULL)
        PHP_FE(gethostbyname,                                                   NULL)
        PHP_FE(gethostbynamel,                                                  NULL)
@@ -2256,6 +2260,7 @@ PHP_FUNCTION(ignore_user_abort)
 
 /* {{{ proto int getservbyname(string service, string protocol)
    Returns port associated with service. Protocol must be "tcp" or "udp". */
+#if HAVE_GETSERVBYNAME
 PHP_FUNCTION(getservbyname)
 {
        pval **name,**proto;
@@ -2274,6 +2279,7 @@ PHP_FUNCTION(getservbyname)
 
        RETURN_LONG(ntohs(serv->s_port));
 }
+#endif
 /* }}} */