diff options
| author | Remi Collet <remi@php.net> | 2015-01-05 17:35:14 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2015-01-05 17:35:14 +0100 |
| commit | eb1a1d5feb0999f343caed90e05a8dc251658bd0 (patch) | |
| tree | 6a765175887ffe53a0dd4c42090817dc9f73517e | |
| parent | 38f1b569c27eef4d7edaca1bd70230f330a12b97 (diff) | |
| parent | 4bb580adb1d24504370f5da6434d9bc1bcc582fe (diff) | |
| download | php-git-eb1a1d5feb0999f343caed90e05a8dc251658bd0.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fix bug #68751 listen.allowed_clients is broken
| -rw-r--r-- | sapi/fpm/fpm/fastcgi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/fpm/fastcgi.c b/sapi/fpm/fpm/fastcgi.c index d2764a59b7..5d46913cec 100644 --- a/sapi/fpm/fpm/fastcgi.c +++ b/sapi/fpm/fpm/fastcgi.c @@ -258,7 +258,7 @@ void fcgi_set_allowed_clients(char *ip) cur++; } if (allowed_clients) free(allowed_clients); - allowed_clients = malloc(sizeof(in_addr_t) * (n+2)); + allowed_clients = malloc(sizeof(sa_t) * (n+2)); n = 0; cur = ip; while (cur) { |