diff options
| author | Anatol Belski <ab@php.net> | 2015-01-22 10:04:33 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-22 10:04:33 +0100 |
| commit | a2e83332b96b69a6b512ff65200aae9f30258ebf (patch) | |
| tree | 73012c7658e51fc5dc0c19f1e6d86d02e1f65ac8 | |
| parent | a97ca0a452bb93300e21d69f15921a9247d97ef9 (diff) | |
| parent | d0928b7f97b7882e0dca5faa26b85a8d43121c07 (diff) | |
| download | php-git-a2e83332b96b69a6b512ff65200aae9f30258ebf.tar.gz | |
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
| -rw-r--r-- | sapi/fpm/fpm/fpm_conf.c | 2 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_sockets.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index cca4e1dbb8..d812452e43 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -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"; } } diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c index 065f63e762..46ce161844 100644 --- a/sapi/fpm/fpm/fpm_sockets.c +++ b/sapi/fpm/fpm/fpm_sockets.c @@ -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; } |