Download | Plain Text | Line Numbers


diff -Naur php-5.6.0.orig/sapi/fpm/fpm/fpm_main.c php-5.6.0/sapi/fpm/fpm/fpm_main.c
--- php-5.6.0.orig/sapi/fpm/fpm/fpm_main.c	2014-08-27 15:31:35.000000000 +0200
+++ php-5.6.0/sapi/fpm/fpm/fpm_main.c	2014-09-23 17:02:27.216896610 +0200
@@ -1416,7 +1416,6 @@
 	int *mode = (int *)arg;
 	char *key;
 	char *value = NULL;
-	struct key_value_s kv;
 
 	if (!mode || !arg1) return;
 
@@ -1427,7 +1426,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;
 	}
@@ -1441,10 +1440,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(key, Z_STRLEN_P(arg1) + 1, value, Z_STRLEN_P(arg2), *mode, PHP_INI_STAGE_HTACCESS) == FAILURE) {
 		zlog(ZLOG_ERROR, "Passing INI directive through FastCGI: unable to set '%s'", key);
 	}
 }