Commit 3b5af63

committed

fpm: ini settings passed through fcgi env should be restored after the request has finished

1 parent 40f3722 commit 3b5af63Copy full SHA for 3b5af63

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1396,7 +1396,6 @@ static void fastcgi_ini_parser(zval arg1, zval arg2, zval *arg3, int callback_`
`1396`	`1396`	`int mode = (int )arg;`
`1397`	`1397`	`char *key;`
`1398`	`1398`	`char *value = NULL;`
`1399`		`- struct key_value_s kv;`
`1400`	`1399`
`1401`	`1400`	`if (!mode \|\| !arg1) return;`
`1402`	`1401`
`@@ -1421,10 +1420,7 @@ static void fastcgi_ini_parser(zval arg1, zval arg2, zval *arg3, int callback_`
`1421`	`1420`	`return;`
`1422`	`1421`	`}`
`1423`	`1422`
`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) {`
`1428`	`1424`	`zlog(ZLOG_ERROR, "Passing INI directive through FastCGI: unable to set '%s'", key);`
`1429`	`1425`	`}`
`1430`	`1426`	`}`

Comments

(0)