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 /sapi/cgi/fastcgi.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 'sapi/cgi/fastcgi.c')
| -rw-r--r-- | sapi/cgi/fastcgi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c index af62ef27d4..1e0702b793 100644 --- a/sapi/cgi/fastcgi.c +++ b/sapi/cgi/fastcgi.c @@ -28,6 +28,10 @@ #include <stdarg.h> #include <errno.h> +#ifndef MAXFQDNLEN +#define MAXFQDNLEN 255 +#endif + #ifdef _WIN32 #include <windows.h> @@ -616,7 +620,7 @@ int fcgi_listen(const char *path, int backlog) if (sa.sa_inet.sin_addr.s_addr == INADDR_NONE) { struct hostent *hep; - if(strlen(host) > MAXHOSTNAMELEN) { + if(strlen(host) > MAXFQDNLEN) { hep = NULL; } else { hep = gethostbyname(host); |