Fixed bug #70538 ("php-fpm -i" crashes)

diff --git a/NEWS b/NEWS
index b62d85614349e110bef4c3ab812d07e425e6c681..3d8abc9d9a6a68b0d5d9681b32aeb4aaa491ebb4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,10 @@ PHP                                                                        NEWS
   . Fixed bug #70481 (Memory leak in auto_global_copy_ctor() in ZTS build).
     (Laruence)
 
+- FPM:
+  . Fixed bug #70538 ("php-fpm -i" crashes). (rainer dot jung at
+    kippdata dot de)
+
 - OpenSSL
   . Require at least OpenSSL version 0.9.8. (Jakub Zelenka)
 

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 18f8a908db9d28d773b688a5548cb3e8c93660b2..ca478b31f34327eb1150ee2d95e710cc50de0f7b 100644 (file)
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -589,7 +589,6 @@ void cgi_php_import_environment_variables(zval *array_ptr) /* {{{ */
 
 static void sapi_cgi_register_variables(zval *track_vars_array) /* {{{ */
 {
-       fcgi_request *request = (fcgi_request*) SG(server_context);
        size_t php_self_len;
        char *php_self;
 
@@ -601,7 +600,7 @@ static void sapi_cgi_register_variables(zval *track_vars_array) /* {{{ */
        if (CGIG(fix_pathinfo)) {
                char *script_name = SG(request_info).request_uri;
                unsigned int script_name_len = script_name ? strlen(script_name) : 0;
-               char *path_info = request? FCGI_GETENV(request, "PATH_INFO") : NULL;
+               char *path_info = sapi_cgibin_getenv("PATH_INFO", sizeof("PATH_INFO") - 1);
                unsigned int path_info_len = path_info ? strlen(path_info) : 0;
 
                php_self_len = script_name_len + path_info_len;