Remove gethostbyname from ABI (mostly)

Callers should use php_network_getaddress* instead.

Author: NattyNarwhal

build/ax_func_which_gethostbyname_r.m4

@@ -4,7 +4,6 @@ dnl Include external macro definitions before the AC_INIT to also remove
 dnl comments starting with # and empty newlines from the included files.
 dnl ----------------------------------------------------------------------------
 m4_include([build/ax_check_compile_flag.m4])
-m4_include([build/ax_func_which_gethostbyname_r.m4])
 m4_include([build/ax_gcc_func_attribute.m4])
 
 m4_include([build/libtool.m4])

configure.ac

@@ -1459,91 +1459,3 @@ PHPAPI int php_poll2(php_pollfd *ufds, unsigned int nfds, int timeout)
 	return n;
 }
 #endif
-
-#if defined(HAVE_GETHOSTBYNAME_R)
-#ifdef HAVE_FUNC_GETHOSTBYNAME_R_6
-static struct hostent * gethostname_re (const char *host,struct hostent *hostbuf,char **tmphstbuf,size_t *hstbuflen)
-{
-	struct hostent *hp;
-	int herr,res;
-
-	if (*hstbuflen == 0) {
-		*hstbuflen = 1024;
-		*tmphstbuf = (char *)malloc (*hstbuflen);
-	}
-
-	while (( res =
-		gethostbyname_r(host,hostbuf,*tmphstbuf,*hstbuflen,&hp,&herr))
-		&& (errno == ERANGE)) {
-		/* Enlarge the buffer. */
-		*hstbuflen *= 2;
-		*tmphstbuf = (char *)realloc (*tmphstbuf,*hstbuflen);
-	}
-
-	if (res != 0) {
-		return NULL;
-	}
-
-	return hp;
-}
-#endif
-#ifdef HAVE_FUNC_GETHOSTBYNAME_R_5
-static struct hostent * gethostname_re (const char *host,struct hostent *hostbuf,char **tmphstbuf,size_t *hstbuflen)
-{
-	struct hostent *hp;
-	int herr;
-
-	if (*hstbuflen == 0) {
-		*hstbuflen = 1024;
-		*tmphstbuf = (char *)malloc (*hstbuflen);
-	}
-
-	while ((NULL == ( hp =
-		gethostbyname_r(host,hostbuf,*tmphstbuf,*hstbuflen,&herr)))
-		&& (errno == ERANGE)) {
-		/* Enlarge the buffer. */
-		*hstbuflen *= 2;
-		*tmphstbuf = (char *)realloc (*tmphstbuf,*hstbuflen);
-	}
-	return hp;
-}
-#endif
-#ifdef HAVE_FUNC_GETHOSTBYNAME_R_3
-static struct hostent * gethostname_re (const char *host,struct hostent *hostbuf,char **tmphstbuf,size_t *hstbuflen)
-{
-	if (*hstbuflen == 0) {
-		*hstbuflen = sizeof(struct hostent_data);
-		*tmphstbuf = (char *)malloc (*hstbuflen);
-	} else {
-		if (*hstbuflen < sizeof(struct hostent_data)) {
-			*hstbuflen = sizeof(struct hostent_data);
-			*tmphstbuf = (char *)realloc(*tmphstbuf, *hstbuflen);
-		}
-	}
-	memset((void *)(*tmphstbuf),0,*hstbuflen);
-
-	if (0 != gethostbyname_r(host,hostbuf,(struct hostent_data *)*tmphstbuf)) {
-		return NULL;
-	}
-
-	return hostbuf;
-}
-#endif
-#endif
-
-PHPAPI struct hostent*	php_network_gethostbyname(const char *name) {
-#if !defined(HAVE_GETHOSTBYNAME_R)
-	return gethostbyname(name);
-#else
-	if (FG(tmp_host_buf)) {
-		free(FG(tmp_host_buf));
-	}
-
-	FG(tmp_host_buf) = NULL;
-	FG(tmp_host_buf_len) = 0;
-
-	memset(&FG(tmp_host_info), 0, sizeof(struct hostent));
-
-	return gethostname_re(name, &FG(tmp_host_info), &FG(tmp_host_buf), &FG(tmp_host_buf_len));
-#endif
-}

main/network.c

@@ -385,8 +385,6 @@ PHPAPI void php_network_populate_name_from_sockaddr(
 PHPAPI zend_result php_network_parse_network_address_with_port(const char *addr,
 		size_t addrlen, struct sockaddr *sa, socklen_t *sl);
 
-PHPAPI struct hostent*	php_network_gethostbyname(const char *name);
-
 PHPAPI zend_result php_set_sock_blocking(php_socket_t socketd, bool block);
 END_EXTERN_C()