mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Slightly modify and merge PR#105 from @MegaManSec

Browse Source
This commit is contained in:
Rasmus Lerdorf 2015-01-21 11:39:23 -08:00
parent 24157f396c
commit e242f871df
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sapi/fpm/fpm/fpm_conf.c
View File

@ -574,6 +574,8 @@ static char *fpm_conf_set_array(zval *key, zval *value, void **config, int conve
} else {
kv->value = strdup(Z_STRVAL_P(value));
if (fpm_conf_expand_pool_name(&kv->value) == -1) {
free(kv->key);
free(kv);
return "Can't use '$pool' when the pool is not defined";
}
}

1
sapi/fpm/fpm/fpm_sockets.c
View File

@ -297,6 +297,7 @@ static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp) /*
if ((status = getaddrinfo(addr, port_str, &hints, &servinfo)) != 0) {
zlog(ZLOG_ERROR, "getaddrinfo: %s\n", gai_strerror(status));
free(dup_address);
return -1;
}