diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-31 21:48:40 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-31 21:48:40 -0800 |
| commit | 6a960b6d1b2b3cdbce7d6faf9e58087297a45887 (patch) | |
| tree | 2cb0952aff99dc29ac5a86f4a3fe41641842a78d /ext/sockets | |
| parent | 41bdd6e7cc7671b1c000261a3ccb73411732ce2b (diff) | |
| parent | af1f867308ca68e82a2143f62ecd7a6f7b19ba2a (diff) | |
| download | php-git-6a960b6d1b2b3cdbce7d6faf9e58087297a45887.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
Diffstat (limited to 'ext/sockets')
| -rw-r--r-- | ext/sockets/sockaddr_conv.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ext/sockets/sockaddr_conv.c b/ext/sockets/sockaddr_conv.c index 80807dd243..961896bdab 100644 --- a/ext/sockets/sockaddr_conv.c +++ b/ext/sockets/sockaddr_conv.c @@ -9,10 +9,6 @@ #include <arpa/inet.h> #endif -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 255 -#endif - extern int php_string_to_if_index(const char *val, unsigned *out TSRMLS_DC); #if HAVE_IPV6 @@ -94,7 +90,7 @@ int php_set_inet_addr(struct sockaddr_in *sin, char *string, php_socket *php_soc if (inet_aton(string, &tmp)) { sin->sin_addr.s_addr = tmp.s_addr; } else { - if (strlen(string) > MAXHOSTNAMELEN || ! (host_entry = gethostbyname(string))) { + if (strlen(string) > MAXFQDNLEN || ! (host_entry = gethostbyname(string))) { /* Note: < -10000 indicates a host lookup error */ #ifdef PHP_WIN32 PHP_SOCKET_ERROR(php_sock, "Host lookup failed", WSAGetLastError()); |