diff options
| author | Remi Collet <remi@php.net> | 2013-05-02 10:15:49 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-05-02 10:15:49 +0200 |
| commit | 2f12769db06fa395c6efc22aa9fa01f82f4b3168 (patch) | |
| tree | f27a06a94daa3e921bdf6de28ac5e3ccf59e2dbe /sapi/fpm | |
| parent | d42ae3273807ba0ea7ae73f126aceed41c5e4a55 (diff) | |
| parent | 78c48af2f2702eb88727a65f1756273b95a88138 (diff) | |
| download | php-git-2f12769db06fa395c6efc22aa9fa01f82f4b3168.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
use limit_extensions as we use security_limit_extensions later (free)
unused variable
Diffstat (limited to 'sapi/fpm')
| -rw-r--r-- | sapi/fpm/fpm/fpm_conf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 25e2cc43a1..d8a57c5bee 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -1002,7 +1002,7 @@ static int fpm_conf_process_all_pools() /* {{{ */ nb_ext = 0; /* find the number of extensions */ - while ((ext = strtok(limit_extensions, " \t"))) { + while (strtok(limit_extensions, " \t")) { limit_extensions = NULL; nb_ext++; } @@ -1024,8 +1024,8 @@ static int fpm_conf_process_all_pools() /* {{{ */ nb_ext = 0; /* parse the string and save the extension in the array */ - while ((ext = strtok(security_limit_extensions, " \t"))) { - security_limit_extensions = NULL; + while ((ext = strtok(limit_extensions, " \t"))) { + limit_extensions = NULL; wp->limit_extensions[nb_ext++] = strdup(ext); } |