php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-31 20:53:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' into PHP-5.5

Browse Source 
* PHP-5.4:
  use limit_extensions as we use security_limit_extensions later (free)
  unused variable
This commit is contained in:
Remi Collet
2013-05-02 10:15:49 +02:00
parent d42ae32738 78c48af2f2
commit 2f12769db0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}