Skip to content

Commit 3b5af63

Browse files
committed
fpm: ini settings passed through fcgi env should be restored after the request has finished
1 parent 40f3722 commit 3b5af63

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

sapi/fpm/fpm/fpm_main.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,7 +1396,6 @@ static void fastcgi_ini_parser(zval *arg1, zval *arg2, zval *arg3, int callback_
13961396
int *mode = (int *)arg;
13971397
char *key;
13981398
char *value = NULL;
1399-
struct key_value_s kv;
14001399

14011400
if (!mode || !arg1) return;
14021401

@@ -1421,10 +1420,7 @@ static void fastcgi_ini_parser(zval *arg1, zval *arg2, zval *arg3, int callback_
14211420
return;
14221421
}
14231422

1424-
kv.key = key;
1425-
kv.value = value;
1426-
kv.next = NULL;
1427-
if (fpm_php_apply_defines_ex(&kv, *mode) == -1) {
1423+
if (zend_alter_ini_entry_chars(Z_STR_P(arg1), Z_STRVAL_P(arg2), Z_STRLEN_P(arg2), *mode, PHP_INI_STAGE_HTACCESS) == FAILURE) {
14281424
zlog(ZLOG_ERROR, "Passing INI directive through FastCGI: unable to set '%s'", key);
14291425
}
14301426
}

0 commit comments

Comments
 (0)