Download | Plain Text | No Line Numbers 

  1. diff -Naur php-7.0.0.orig/sapi/fpm/fpm/fpm_main.c php-7.0.0/sapi/fpm/fpm/fpm_main.c
  2. --- php-7.0.0.orig/sapi/fpm/fpm/fpm_main.c	2015-09-29 23:48:14.000000000 +0200
  3. +++ php-7.0.0/sapi/fpm/fpm/fpm_main.c	2015-10-10 18:30:16.119468886 +0200
  4. @@ -1404,7 +1404,6 @@
  5.  	int *mode = (int *)arg;
  6.  	char *key;
  7.  	char *value = NULL;
  8. -	struct key_value_s kv;
  9.  
  10.  	if (!mode || !arg1) return;
  11.  
  12. @@ -1415,7 +1414,7 @@
  13.  
  14.  	key = Z_STRVAL_P(arg1);
  15.  
  16. -	if (!key || strlen(key) < 1) {
  17. +	if (!key || Z_STRLEN_P(arg1) < 1) {
  18.  		zlog(ZLOG_ERROR, "Passing INI directive through FastCGI: empty key");
  19.  		return;
  20.  	}
  21. @@ -1429,10 +1428,7 @@
  22.  		return;
  23.  	}
  24.  
  25. -	kv.key = key;
  26. -	kv.value = value;
  27. -	kv.next = NULL;
  28. -	if (fpm_php_apply_defines_ex(&kv, *mode) == -1) {
  29. +	if (zend_alter_ini_entry(Z_STR_P(arg1), Z_STR_P(arg2), *mode, PHP_INI_STAGE_HTACCESS) == FAILURE) {
  30.  		zlog(ZLOG_ERROR, "Passing INI directive through FastCGI: unable to set '%s'", key);
  31.  	}
  32.  }
  33.