php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove HAVE_INET_PTON (#13410)

Browse Source
This commit is contained in:
Jorg Adam Sowa
2024-02-21 01:43:56 +01:00
committed by GitHub
parent f5efaa39fa
commit e630aacf79
22 changed files with 60 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/Optimizer/zend_func_infos.h
View File

@@ -517,9 +517,7 @@ static const func_info_t func_infos[] = {
F1("sha1", MAY_BE_STRING),
F1("sha1_file", MAY_BE_STRING|MAY_BE_FALSE),
F1("inet_ntop", MAY_BE_STRING|MAY_BE_FALSE),
#if defined(HAVE_INET_PTON)
F1("inet_pton", MAY_BE_STRING|MAY_BE_FALSE),
#endif
F1("metaphone", MAY_BE_STRING),
F1("headers_list", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING),
F1("htmlspecialchars", MAY_BE_STRING),

7
configure.ac
View File

@@ -601,7 +601,6 @@ getgrnam_r \
getpwuid_r \
getwd \
glob \
inet_pton \
localtime_r \
lchown \
memcntl \
@@ -638,10 +637,8 @@ memrchr \
mempcpy \
)
AC_CHECK_FUNC(inet_ntop,[],[
AC_MSG_ERROR([Cannot find inet_ntop which is required])
]
)
AC_CHECK_FUNC([inet_ntop],,[AC_MSG_ERROR([Required inet_ntop not found.])])
AC_CHECK_FUNC([inet_pton],,[AC_MSG_ERROR([Required inet_pton not found.])])
dnl Check for strerror_r, and if its a POSIX-compatible or a GNU specific version.
AC_FUNC_STRERROR_R

2
ext/ftp/ftp.c
View File

@@ -1704,7 +1704,7 @@ ftp_getdata(ftpbuf_t *ftp)
data->listener = fd;
#if defined(HAVE_IPV6)
#ifdef HAVE_IPV6
if (sa->sa_family == AF_INET6) {
/* need to use EPRT */
char eprtarg[INET6_ADDRSTRLEN + sizeof("|x||xxxxx|")];

2
ext/openssl/xp_ssl.c
View File

@@ -130,7 +130,7 @@
#define PHP_X509_NAME_ENTRY_TO_UTF8(ne, i, out) \
ASN1_STRING_to_UTF8(&out, X509_NAME_ENTRY_get_data(X509_NAME_get_entry(ne, i)))
#if defined(HAVE_IPV6) && defined(HAVE_INET_PTON)
#ifdef HAVE_IPV6
/* Used for IPv6 Address peer verification */
#define EXPAND_IPV6_ADDRESS(_str, _bytes) \
do { \

8
ext/sockets/conversions.c
View File

@@ -514,7 +514,7 @@ static void to_zval_read_sa_family(const char *data, zval *zv, res_context *ctx)
ZVAL_LONG(zv, (zend_long)ival);
}
#if HAVE_IPV6
#ifdef HAVE_IPV6
static void to_zval_read_unsigned(const char *data, zval *zv, res_context *ctx)
{
unsigned ival;
@@ -597,7 +597,7 @@ static void to_zval_read_sockaddr_in(const char *data, zval *zv, res_context *ct
{
to_zval_read_aggregation(data, zv, descriptors_sockaddr_in, ctx);
}
#if HAVE_IPV6
#ifdef HAVE_IPV6
static void from_zval_write_sin6_addr(const zval *zaddr_str, char *addr6, ser_context *ctx)
{
int res;
@@ -753,7 +753,7 @@ static void from_zval_write_sockaddr_aux(const zval *container,
}
break;
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6:
if (ctx->sock->type != AF_INET6) {
do_from_zval_err(ctx, "the specified family (AF_INET6) is not "
@@ -817,7 +817,7 @@ static void to_zval_read_sockaddr_aux(const char *sockaddr_c, zval *zv, res_cont
to_zval_read_sockaddr_in(sockaddr_c, zv, ctx);
break;
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6:
to_zval_read_sockaddr_in6(sockaddr_c, zv, ctx);
break;

4
ext/sockets/multicast.c
View File

@@ -475,7 +475,7 @@ static int _php_mcast_join_leave(
join ? IP_ADD_MEMBERSHIP : IP_DROP_MEMBERSHIP, (char*)&mreq,
sizeof(mreq));
}
#if HAVE_IPV6
#ifdef HAVE_IPV6
else if (sock->type == AF_INET6) {
struct ipv6_mreq mreq;
memset(&mreq, 0, sizeof(struct ipv6_mreq));
@@ -543,7 +543,7 @@ static int _php_mcast_source_op(
return setsockopt(sock->bsd_socket, level,
_php_source_op_to_ipv4_op(sop), (char*)&mreqs, sizeof(mreqs));
}
#if HAVE_IPV6
#ifdef HAVE_IPV6
else if (sock->type == AF_INET6) {
php_error_docref(NULL, E_WARNING,
"This platform does not support %s for IPv6 sockets",

2
ext/sockets/sendrecvmsg.c
View File

@@ -326,7 +326,7 @@ PHP_FUNCTION(socket_cmsg_space)
RETURN_LONG((zend_long)CMSG_SPACE(entry->size + n * entry->var_el_size));
}
#if HAVE_IPV6
#ifdef HAVE_IPV6
int php_do_setsockopt_ipv6_rfc3542(php_socket *php_sock, int level, int optname, zval *arg4)
{
struct err_s err = {0};

8
ext/sockets/sockaddr_conv.c
View File

@@ -11,7 +11,7 @@
extern zend_result php_string_to_if_index(const char *val, unsigned *out);
#if HAVE_IPV6
#ifdef HAVE_IPV6
/* Sets addr by hostname, or by ip in string form (AF_INET6) */
int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket *php_sock) /* {{{ */
{
@@ -89,11 +89,7 @@ int php_set_inet_addr(struct sockaddr_in *sin, char *string, php_socket *php_soc
struct in_addr tmp;
struct hostent *host_entry;
#ifdef HAVE_INET_PTON
if (inet_pton(AF_INET, string, &tmp)) {
#else
if (inet_aton(string, &tmp)) {
#endif
sin->sin_addr.s_addr = tmp.s_addr;
} else {
if (strlen(string) > MAXFQDNLEN || ! (host_entry = php_network_gethostbyname(string))) {
@@ -129,7 +125,7 @@ int php_set_inet46_addr(php_sockaddr_storage *ss, socklen_t *ss_len, char *strin
return 1;
}
}
#if HAVE_IPV6
#ifdef HAVE_IPV6
else if (php_sock->type == AF_INET6) {
struct sockaddr_in6 t = {0};
if (php_set_inet6_addr(&t, string, php_sock)) {

36
ext/sockets/sockets.c
View File

@@ -920,7 +920,7 @@ PHP_FUNCTION(socket_getsockname)
php_socket *php_sock;
struct sockaddr *sa;
struct sockaddr_in *sin;
#if HAVE_IPV6
#ifdef HAVE_IPV6
struct sockaddr_in6 *sin6;
#endif
char addrbuf[INET6_ADDRSTRLEN];
@@ -943,7 +943,7 @@ PHP_FUNCTION(socket_getsockname)
}
switch (sa->sa_family) {
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6:
sin6 = (struct sockaddr_in6 *) sa;
inet_ntop(AF_INET6, &sin6->sin6_addr, addrbuf, sizeof(addrbuf));
@@ -988,7 +988,7 @@ PHP_FUNCTION(socket_getpeername)
php_socket *php_sock;
struct sockaddr *sa;
struct sockaddr_in *sin;
#if HAVE_IPV6
#ifdef HAVE_IPV6
struct sockaddr_in6 *sin6;
#endif
char addrbuf[INET6_ADDRSTRLEN];
@@ -1011,7 +1011,7 @@ PHP_FUNCTION(socket_getpeername)
}
switch (sa->sa_family) {
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6:
sin6 = (struct sockaddr_in6 *) sa;
inet_ntop(AF_INET6, &sin6->sin6_addr, addrbuf, sizeof(addrbuf));
@@ -1062,7 +1062,7 @@ PHP_FUNCTION(socket_create)
}
if (domain != AF_UNIX
#if HAVE_IPV6
#ifdef HAVE_IPV6
&& domain != AF_INET6
#endif
&& domain != AF_INET) {
@@ -1113,7 +1113,7 @@ PHP_FUNCTION(socket_connect)
ENSURE_SOCKET_VALID(php_sock);
switch(php_sock->type) {
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6: {
struct sockaddr_in6 sin6 = {0};
@@ -1247,7 +1247,7 @@ PHP_FUNCTION(socket_bind)
retval = bind(php_sock->bsd_socket, (struct sockaddr *)sa, sizeof(struct sockaddr_in));
break;
}
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6:
{
struct sockaddr_in6 *sa = (struct sockaddr_in6 *) sock_type;
@@ -1357,7 +1357,7 @@ PHP_FUNCTION(socket_recvfrom)
php_socket *php_sock;
struct sockaddr_un s_un;
struct sockaddr_in sin;
#if HAVE_IPV6
#ifdef HAVE_IPV6
struct sockaddr_in6 sin6;
#endif
char addrbuf[INET6_ADDRSTRLEN];
@@ -1428,7 +1428,7 @@ PHP_FUNCTION(socket_recvfrom)
ZEND_TRY_ASSIGN_REF_STRING(arg5, address ? address : "0.0.0.0");
ZEND_TRY_ASSIGN_REF_LONG(arg6, ntohs(sin.sin_port));
break;
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6:
slen = sizeof(sin6);
memset(&sin6, 0, slen);
@@ -1473,7 +1473,7 @@ PHP_FUNCTION(socket_sendto)
php_socket *php_sock;
struct sockaddr_un s_un;
struct sockaddr_in sin;
#if HAVE_IPV6
#ifdef HAVE_IPV6
struct sockaddr_in6 sin6;
#endif
int retval;
@@ -1519,7 +1519,7 @@ PHP_FUNCTION(socket_sendto)
retval = sendto(php_sock->bsd_socket, buf, ((size_t)len > buf_len) ? buf_len : (size_t)len, flags, (struct sockaddr *) &sin, sizeof(sin));
break;
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6:
if (port_is_null) {
zend_argument_value_error(6, "cannot be null when the socket type is AF_INET6");
@@ -1590,7 +1590,7 @@ PHP_FUNCTION(socket_get_option)
}
}
}
#if HAVE_IPV6
#ifdef HAVE_IPV6
else if (level == IPPROTO_IPV6) {
int ret = php_do_getsockopt_ipv6_rfc3542(php_sock, level, optname, return_value);
if (ret == SUCCESS) {
@@ -1795,7 +1795,7 @@ PHP_FUNCTION(socket_set_option)
HANDLE_SUBCALL(res);
}
#if HAVE_IPV6
#ifdef HAVE_IPV6
else if (level == IPPROTO_IPV6) {
int res = php_do_setsockopt_ipv6_mcast(php_sock, level, optname, arg4);
if (res == 1) {
@@ -1999,7 +1999,7 @@ PHP_FUNCTION(socket_create_pair)
}
if (domain != AF_INET
#if HAVE_IPV6
#ifdef HAVE_IPV6
&& domain != AF_INET6
#endif
&& domain != AF_UNIX) {
@@ -2258,7 +2258,7 @@ PHP_FUNCTION(socket_export_stream)
/* Determine if socket is using a protocol with one of the default registered
* socket stream wrappers */
if (socket->type == PF_INET
#if HAVE_IPV6
#ifdef HAVE_IPV6
|| socket->type == PF_INET6
#endif
) {
@@ -2435,7 +2435,7 @@ PHP_FUNCTION(socket_addrinfo_bind)
}
case AF_INET:
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6:
#endif
{
@@ -2498,7 +2498,7 @@ PHP_FUNCTION(socket_addrinfo_connect)
}
case AF_INET:
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6:
#endif
{
@@ -2555,7 +2555,7 @@ PHP_FUNCTION(socket_addrinfo_explain)
add_assoc_string(&sockaddr, "sin_addr", addr);
break;
}
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6:
{
struct sockaddr_in6 *sa = (struct sockaddr_in6 *) ai->addrinfo.ai_addr;

8
ext/sockets/sockets.stub.php
View File

@@ -12,7 +12,7 @@ const AF_UNIX = UNKNOWN;
* @cvalue AF_INET
*/
const AF_INET = UNKNOWN;
#if HAVE_IPV6
#ifdef HAVE_IPV6
/**
* @var int
* @cvalue AF_INET6
@@ -649,7 +649,7 @@ const IP_MULTICAST_LOOP = UNKNOWN;
*/
const IP_BIND_ADDRESS_NO_PORT = UNKNOWN;
#endif
#if HAVE_IPV6
#ifdef HAVE_IPV6
/**
* @var int
* @cvalue IPV6_MULTICAST_IF
@@ -1542,7 +1542,7 @@ const SOCKET_NO_ADDRESS = UNKNOWN;
* @cvalue IPPROTO_IP
*/
const IPPROTO_IP = UNKNOWN;
#if HAVE_IPV6
#ifdef HAVE_IPV6
/**
* @var int
* @cvalue IPPROTO_IPV6
@@ -1568,7 +1568,7 @@ const SOL_UDP = UNKNOWN;
const SOL_UDPLITE = UNKNOWN;
#endif
#if HAVE_IPV6
#ifdef HAVE_IPV6
/**
* @var int
* @cvalue IPV6_UNICAST_HOPS

14
ext/sockets/sockets_arginfo.h generated
View File

@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: f1bb7ebc6cd2353fc3bac6ad5d3c5644036e3aeb */
* Stub hash: 5aebcb542405e392cbe7129eac964826f61f7dac */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_socket_select, 0, 4, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(1, read, IS_ARRAY, 1)
@@ -334,7 +334,7 @@ static void register_sockets_symbols(int module_number)
{
REGISTER_LONG_CONSTANT("AF_UNIX", AF_UNIX, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("AF_INET", AF_INET, CONST_PERSISTENT);
#if HAVE_IPV6
#if defined(HAVE_IPV6)
REGISTER_LONG_CONSTANT("AF_INET6", AF_INET6, CONST_PERSISTENT);
#endif
#if defined(AF_DIVERT)
@@ -575,13 +575,13 @@ static void register_sockets_symbols(int module_number)
#if defined(IP_BIND_ADDRESS_NO_PORT)
REGISTER_LONG_CONSTANT("IP_BIND_ADDRESS_NO_PORT", IP_BIND_ADDRESS_NO_PORT, CONST_PERSISTENT);
#endif
#if HAVE_IPV6
#if defined(HAVE_IPV6)
REGISTER_LONG_CONSTANT("IPV6_MULTICAST_IF", IPV6_MULTICAST_IF, CONST_PERSISTENT);
#endif
#if HAVE_IPV6
#if defined(HAVE_IPV6)
REGISTER_LONG_CONSTANT("IPV6_MULTICAST_HOPS", IPV6_MULTICAST_HOPS, CONST_PERSISTENT);
#endif
#if HAVE_IPV6
#if defined(HAVE_IPV6)
REGISTER_LONG_CONSTANT("IPV6_MULTICAST_LOOP", IPV6_MULTICAST_LOOP, CONST_PERSISTENT);
#endif
#if defined(IPV6_V6ONLY)
@@ -921,7 +921,7 @@ static void register_sockets_symbols(int module_number)
REGISTER_LONG_CONSTANT("SOCKET_NO_ADDRESS", WSANO_ADDRESS, CONST_PERSISTENT);
#endif
REGISTER_LONG_CONSTANT("IPPROTO_IP", IPPROTO_IP, CONST_PERSISTENT);
#if HAVE_IPV6
#if defined(HAVE_IPV6)
REGISTER_LONG_CONSTANT("IPPROTO_IPV6", IPPROTO_IPV6, CONST_PERSISTENT);
#endif
REGISTER_LONG_CONSTANT("SOL_TCP", IPPROTO_TCP, CONST_PERSISTENT);
@@ -929,7 +929,7 @@ static void register_sockets_symbols(int module_number)
#if defined(IPPROTO_UDPLITE)
REGISTER_LONG_CONSTANT("SOL_UDPLITE", IPPROTO_UDPLITE, CONST_PERSISTENT);
#endif
#if HAVE_IPV6
#if defined(HAVE_IPV6)
REGISTER_LONG_CONSTANT("IPV6_UNICAST_HOPS", IPV6_UNICAST_HOPS, CONST_PERSISTENT);
#endif
REGISTER_LONG_CONSTANT("AI_PASSIVE", AI_PASSIVE, CONST_PERSISTENT);

21
ext/standard/basic_functions.c
View File

@@ -555,7 +555,6 @@ PHP_FUNCTION(inet_ntop)
}
/* }}} */
#ifdef HAVE_INET_PTON
/* {{{ Converts a human readable IP address to a packed binary string */
PHP_FUNCTION(inet_pton)
{
@@ -588,42 +587,22 @@ PHP_FUNCTION(inet_pton)
RETURN_STRINGL(buffer, af == AF_INET ? 4 : 16);
}
/* }}} */
#endif /* HAVE_INET_PTON */
/* {{{ Converts a string containing an (IPv4) Internet Protocol dotted address into a proper address */
PHP_FUNCTION(ip2long)
{
char *addr;
size_t addr_len;
#ifdef HAVE_INET_PTON
struct in_addr ip;
#else
zend_ulong ip;
#endif
ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_STRING(addr, addr_len)
ZEND_PARSE_PARAMETERS_END();
#ifdef HAVE_INET_PTON
if (addr_len == 0 || inet_pton(AF_INET, addr, &ip) != 1) {
RETURN_FALSE;
}
RETURN_LONG(ntohl(ip.s_addr));
#else
if (addr_len == 0 || (ip = inet_addr(addr)) == INADDR_NONE) {
/* The only special case when we should return -1 ourselves,
* because inet_addr() considers it wrong. We return 0xFFFFFFFF and
* not -1 or ~0 because of 32/64bit issues. */
if (addr_len == sizeof("255.255.255.255") - 1 &&
!memcmp(addr, "255.255.255.255", sizeof("255.255.255.255") - 1)
) {
RETURN_LONG(0xFFFFFFFF);
}
RETURN_FALSE;
}
RETURN_LONG(ntohl(ip));
#endif
}
/* }}} */

2
ext/standard/basic_functions.stub.php
View File

@@ -2238,10 +2238,8 @@ function syslog(int $priority, string $message): true {} // TODO make return typ
/** @refcount 1 */
function inet_ntop(string $ip): string|false {}
#ifdef HAVE_INET_PTON
/** @refcount 1 */
function inet_pton(string $ip): string|false {}
#endif
/* metaphone.c */

12
ext/standard/basic_functions_arginfo.h generated
View File

@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 1350cc5169dbd48df08513f01c10d5706d47b8d4 */
* Stub hash: b8ea4527467c70a6f665129cd5d5f34ea2386a70 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -722,11 +722,7 @@ ZEND_END_ARG_INFO()
#define arginfo_inet_ntop arginfo_gethostbyaddr
#if defined(HAVE_INET_PTON)
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_inet_pton, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(0, ip, IS_STRING, 0)
ZEND_END_ARG_INFO()
#endif
#define arginfo_inet_pton arginfo_gethostbyaddr
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_metaphone, 0, 1, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
@@ -2522,9 +2518,7 @@ ZEND_FUNCTION(closelog);
ZEND_FUNCTION(syslog);
#endif
ZEND_FUNCTION(inet_ntop);
#if defined(HAVE_INET_PTON)
ZEND_FUNCTION(inet_pton);
#endif
ZEND_FUNCTION(metaphone);
ZEND_FUNCTION(header);
ZEND_FUNCTION(header_remove);
@@ -3155,9 +3149,7 @@ static const zend_function_entry ext_functions[] = {
ZEND_FE(syslog, arginfo_syslog)
#endif
ZEND_FE(inet_ntop, arginfo_inet_ntop)
#if defined(HAVE_INET_PTON)
ZEND_FE(inet_pton, arginfo_inet_pton)
#endif
ZEND_FE(metaphone, arginfo_metaphone)
ZEND_FE(header, arginfo_header)
ZEND_FE(header_remove, arginfo_header_remove)

4
ext/standard/dns.c
View File

@@ -157,7 +157,7 @@ PHP_FUNCTION(gethostbyaddr)
hostname = php_gethostbyaddr(addr);
if (hostname == NULL) {
#if defined(HAVE_IPV6) && defined(HAVE_INET_PTON)
#ifdef HAVE_IPV6
php_error_docref(NULL, E_WARNING, "Address is not a valid IPv4 or IPv6 address");
#else
php_error_docref(NULL, E_WARNING, "Address is not in a.b.c.d form");
@@ -172,7 +172,7 @@ PHP_FUNCTION(gethostbyaddr)
/* {{{ php_gethostbyaddr */
static zend_string *php_gethostbyaddr(char *ip)
{
#if defined(HAVE_IPV6) && defined(HAVE_INET_PTON)
#ifdef HAVE_IPV6
struct sockaddr_in sa4;
struct sockaddr_in6 sa6;
char out[NI_MAXHOST];

5
ext/standard/tests/network/inet.phpt
View File

@@ -1,10 +1,5 @@
--TEST--
inet_ntop() & inet_pton() tests
--SKIPIF--
<?php
if (!function_exists("inet_ntop")) die("skip no inet_ntop()");
if (!function_exists("inet_pton")) die("skip no inet_pton()");
?>
--FILE--
<?php

2
ext/standard/tests/network/inet_ipv6.phpt
View File

@@ -2,8 +2,6 @@
inet_ntop() & inet_pton() IPv6 tests
--SKIPIF--
<?php
if (!function_exists("inet_ntop")) die("skip no inet_ntop()");
if (!function_exists("inet_pton")) die("skip no inet_pton()");
$packed = str_repeat(chr(0), 15) . chr(1);
if (@inet_ntop($packed) === false) {

6
ext/standard/tests/network/ip2long_variation2.phpt
View File

@@ -1,8 +1,10 @@
--TEST--
Test ip2long() function : usage variation 2, 32 bit
--SKIPIF--
<?php if(PHP_INT_SIZE != 4) {die('skip 32 bit only');} ?>
<?php if (strtolower(substr(PHP_OS, 0, 3)) == 'aix') {die('skip not for AIX');} ?>
<?php
if (PHP_INT_SIZE != 4) { die('skip 32 bit only'); }
if (strtolower(substr(PHP_OS, 0, 3)) == 'aix') { die('skip not for AIX'); }
?>
--FILE--
<?php
$ips = array(

5
main/fastcgi.c
View File

@@ -681,12 +681,7 @@ int fcgi_listen(const char *path, int backlog)
if (!*host || !strncmp(host, "*", sizeof("*")-1)) {
sa.sa_inet.sin_addr.s_addr = htonl(INADDR_ANY);
} else {
#ifdef HAVE_INET_PTON
if (!inet_pton(AF_INET, host, &sa.sa_inet.sin_addr)) {
#else
sa.sa_inet.sin_addr.s_addr = inet_addr(host);
if (sa.sa_inet.sin_addr.s_addr == INADDR_NONE) {
#endif
struct hostent *hep;
if(strlen(host) > MAXFQDNLEN) {

32
main/network.c
View File

@@ -82,7 +82,7 @@ int inet_aton(const char *, struct in_addr *);
# define SOCK_CONN_ERR SOCKET_ERROR
# define PHP_TIMEOUT_ERROR_VALUE WSAETIMEDOUT
#if HAVE_IPV6
#ifdef HAVE_IPV6
const struct in6_addr in6addr_any = {0}; /* IN6ADDR_ANY_INIT; */
#endif
@@ -156,7 +156,7 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka
struct sockaddr **sap;
int n;
#if HAVE_GETADDRINFO
# if HAVE_IPV6
# ifdef HAVE_IPV6
static int ipv6_borked = -1; /* the way this is used *is* thread safe */
# endif
struct addrinfo hints, *res, *sai;
@@ -174,7 +174,7 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka
hints.ai_family = AF_INET; /* default to regular inet (see below) */
hints.ai_socktype = socktype;
# if HAVE_IPV6
# ifdef HAVE_IPV6
/* probe for a working IPv6 stack; even if detected as having v6 at compile
* time, at runtime some stacks are slow to resolve or have other issues
* if they are not correctly configured.
@@ -237,11 +237,7 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka
freeaddrinfo(res);
#else
#ifdef HAVE_INET_PTON
if (!inet_pton(AF_INET, host, &in)) {
#else
if (!inet_aton(host, &in)) {
#endif
if(strlen(host) > MAXFQDNLEN) {
host_info = NULL;
errno = E2BIG;
@@ -518,7 +514,7 @@ PHPAPI int php_network_parse_network_address_with_port(const char *addr, zend_lo
struct sockaddr **psal;
int n;
zend_string *errstr = NULL;
#if HAVE_IPV6
#ifdef HAVE_IPV6
struct sockaddr_in6 *in6 = (struct sockaddr_in6*)sa;
memset(in6, 0, sizeof(struct sockaddr_in6));
@@ -545,7 +541,7 @@ PHPAPI int php_network_parse_network_address_with_port(const char *addr, zend_lo
/* first, try interpreting the address as a numeric address */
#if HAVE_IPV6 && HAVE_INET_PTON
#ifdef HAVE_IPV6
if (inet_pton(AF_INET6, tmp, &in6->sin6_addr) > 0) {
in6->sin6_port = htons(port);
in6->sin6_family = AF_INET6;
@@ -554,11 +550,7 @@ PHPAPI int php_network_parse_network_address_with_port(const char *addr, zend_lo
goto out;
}
#endif
#ifdef HAVE_INET_PTON
if (inet_pton(AF_INET, tmp, &in4->sin_addr) > 0) {
#else
if (inet_aton(tmp, &in4->sin_addr) > 0) {
#endif
in4->sin_port = htons(port);
in4->sin_family = AF_INET;
*sl = sizeof(struct sockaddr_in);
@@ -634,7 +626,7 @@ PHPAPI void php_network_populate_name_from_sockaddr(
break;
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6:
buf = (char*)inet_ntop(sa->sa_family, &((struct sockaddr_in6*)sa)->sin6_addr, (char *)&abuf, sizeof(abuf));
if (buf) {
@@ -852,25 +844,21 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short
union {
struct sockaddr common;
struct sockaddr_in in4;
#if HAVE_IPV6 && HAVE_INET_PTON
#ifdef HAVE_IPV6
struct sockaddr_in6 in6;
#endif
} local_address;
int local_address_len = 0;
if (sa->sa_family == AF_INET) {
#ifdef HAVE_INET_PTON
if (inet_pton(AF_INET, bindto, &local_address.in4.sin_addr) == 1) {
#else
if (inet_aton(bindto, &local_address.in4.sin_addr)) {
#endif
local_address_len = sizeof(struct sockaddr_in);
local_address.in4.sin_family = sa->sa_family;
local_address.in4.sin_port = htons(bindport);
memset(&(local_address.in4.sin_zero), 0, sizeof(local_address.in4.sin_zero));
}
}
#if HAVE_IPV6 && HAVE_INET_PTON
#ifdef HAVE_IPV6
else { /* IPV6 */
if (inet_pton(AF_INET6, bindto, &local_address.in6.sin6_addr) == 1) {
local_address_len = sizeof(struct sockaddr_in6);
@@ -969,7 +957,7 @@ PHPAPI void php_any_addr(int family, php_sockaddr_storage *addr, unsigned short
{
memset(addr, 0, sizeof(php_sockaddr_storage));
switch (family) {
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6: {
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) addr;
sin6->sin6_family = AF_INET6;
@@ -997,7 +985,7 @@ PHPAPI int php_sockaddr_size(php_sockaddr_storage *addr)
switch (((struct sockaddr *)addr)->sa_family) {
case AF_INET:
return sizeof(struct sockaddr_in);
#if HAVE_IPV6
#ifdef HAVE_IPV6
case AF_INET6:
return sizeof(struct sockaddr_in6);
#endif

5
sapi/litespeed/lsapilib.c
View File

@@ -2688,12 +2688,7 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )
((struct sockaddr_in *)pAddr)->sin_addr.s_addr = htonl( INADDR_LOOPBACK );
else
{
#ifdef HAVE_INET_PTON
if (!inet_pton(AF_INET, p, &((struct sockaddr_in *)pAddr)->sin_addr))
#else
((struct sockaddr_in *)pAddr)->sin_addr.s_addr = inet_addr( p );
if ( ((struct sockaddr_in *)pAddr)->sin_addr.s_addr == INADDR_BROADCAST)
#endif
{
doAddrInfo = 1;
}

3
win32/build/config.w32.h.in
View File

@@ -116,9 +116,6 @@
/* Win32 support proc_open */
#define PHP_CAN_SUPPORT_PROC_OPEN 1
/* inet_pton() */
#define HAVE_INET_PTON 1
/* vs.net 2005 has a 64-bit time_t. This will likely break
* 3rdParty libs that were built with older compilers; switch
* back to 32-bit */