Download | Plain Text | Line Numbers
diff -Naur php-7.0.0.orig/sapi/fpm/fpm/fpm_main.c php-7.0.0/sapi/fpm/fpm/fpm_main.c
--- php-7.0.0.orig/sapi/fpm/fpm/fpm_main.c 2015-09-29 23:48:14.000000000 +0200
+++ php-7.0.0/sapi/fpm/fpm/fpm_main.c 2015-10-10 18:30:16.119468886 +0200
@@ -1404,7 +1404,6 @@
int *mode = (int *)arg;
char *key;
char *value = NULL;
- struct key_value_s kv;
if (!mode || !arg1) return;
@@ -1415,7 +1414,7 @@
key = Z_STRVAL_P(arg1);
- if (!key || strlen(key) < 1) {
+ if (!key || Z_STRLEN_P(arg1) < 1) {
zlog(ZLOG_ERROR, "Passing INI directive through FastCGI: empty key");
return;
}
@@ -1429,10 +1428,7 @@
return;
}
- kv.key = key;
- kv.value = value;
- kv.next = NULL;
- if (fpm_php_apply_defines_ex(&kv, *mode) == -1) {
+ if (zend_alter_ini_entry(Z_STR_P(arg1), Z_STR_P(arg2), *mode, PHP_INI_STAGE_HTACCESS) == FAILURE) {
zlog(ZLOG_ERROR, "Passing INI directive through FastCGI: unable to set '%s'", key);
}
}