Patch fpm-info-crash for FPM related Bug #70538

Patch version 2015-09-20 21:57 UTC

• 2015-09-20 21:57 UTC [diff to current]

Developer: rainer.jung@kippdata.de

--- sapi/fpm/fpm/fpm_main.c  2015-09-18 20:37:57.099027000 +0200
+++ sapi/fpm/fpm/fpm_main.c  2015-09-20 23:53:29.210340000 +0200
@@ -590,7 +590,6 @@

 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;

@@ -602,7 +601,7 @@
        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 = FCGI_GETENV(request, "PATH_INFO");
+               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;