Commit: 8492bbefbb74ee0cd009884f6ee82c409ffbe018 Author: Remi Collet <r...@php.net> Thu, 2 May 2013 10:15:12 +0200 Parents: a7d6cb2360fbfae782fe899086012ed8e291d744 Branches: PHP-5.3 PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8492bbefbb74ee0cd009884f6ee82c409ffbe018 Log: use limit_extensions as we use security_limit_extensions later (free) Changed paths: M sapi/fpm/fpm/fpm_conf.c Diff: diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 23641fe..d8a57c5 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -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); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php