diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-31 21:50:08 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-31 21:50:08 -0800 |
| commit | 141b14454c499d8549067cf9ba704c96ce8d0f8c (patch) | |
| tree | 867f7284337306c6c352b2761902ce0589f666a1 /main/network.c | |
| parent | 02fcbe08028361d13785fc90ed9460385af4e549 (diff) | |
| parent | 6a960b6d1b2b3cdbce7d6faf9e58087297a45887 (diff) | |
| download | php-git-141b14454c499d8549067cf9ba704c96ce8d0f8c.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
Conflicts:
ext/sockets/sockaddr_conv.c
ext/standard/dns.c
Diffstat (limited to 'main/network.c')
| -rw-r--r-- | main/network.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/main/network.c b/main/network.c index 50b1f07a6a..e4c99ec064 100644 --- a/main/network.c +++ b/main/network.c @@ -105,10 +105,6 @@ const struct in6_addr in6addr_any = {0}; /* IN6ADDR_ANY_INIT; */ # define PHP_TIMEOUT_ERROR_VALUE ETIMEDOUT #endif -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 255 -#endif - #if HAVE_GETADDRINFO #ifdef HAVE_GAI_STRERROR # define PHP_GAI_STRERROR(x) (gai_strerror(x)) @@ -250,7 +246,7 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka #else if (!inet_aton(host, &in)) { /* XXX NOT THREAD SAFE (is safe under win32) */ - if(strlen(host) > MAXHOSTNAMELEN) { + if(strlen(host) > MAXFQDNLEN) { host_info = NULL; errno = E2BIG; } else { |