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:00:41.317105879 +0200
@@ -1393,13 +1393,14 @@
/* INI stuff */
ini = sapi_cgibin_getenv("PHP_VALUE", sizeof("PHP_VALUE") - 1 TSRMLS_CC);
if (ini) {
- int mode = ZEND_INI_USER;
+ int mode = ZEND_INI_PERDIR;
char *tmp;
spprintf(&tmp, 0, "%s\n", ini);
zend_parse_ini_string(tmp, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t)fastcgi_ini_parser, &mode TSRMLS_CC);
efree(tmp);
}
+#if 0
ini = sapi_cgibin_getenv("PHP_ADMIN_VALUE", sizeof("PHP_ADMIN_VALUE") - 1 TSRMLS_CC);
if (ini) {
int mode = ZEND_INI_SYSTEM;
@@ -1408,6 +1409,7 @@
zend_parse_ini_string(tmp, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t)fastcgi_ini_parser, &mode TSRMLS_CC);
efree(tmp);
}
+#endif
}
/* }}} */