Patch Another_fix_for_mod_proxy_fcgi.patch for FPM related Bug #65641

Patch version 2014-09-05 13:14 UTC

Obsoleted by patches:

• Another_fix_for_mod_proxy_fcgi_v2.patch, revision 2014-09-15 09:13 UTC

• 2014-09-05 13:14 UTC [diff to current]

Developer: remi@php.net

--- /work/php/php-5.6.0/sapi/fpm/fpm/fpm_main.c	2014-08-27 15:31:35.000000000 +0200
+++ ../sapi/fpm/fpm/fpm_main.c	2014-09-05 15:10:06.117825254 +0200
@@ -1237,6 +1237,20 @@
 										SG(request_info).request_uri = orig_script_name;
 									}
 									path_info[0] = old;
+								} else if (apache_was_here && env_script_name) {
+									/* No PATH_INFO in request, but can extract it in PATH_TRANSLATED
+									 * so it is probably also in SCRIPT_NAME and need to be removed
+									 */
+									int snlen = strlen(env_script_name);
+									if (snlen>slen && !strcmp(env_script_name+snlen-slen, path_info)) {
+										char old;
+
+										_sapi_cgibin_putenv("ORIG_SCRIPT_NAME", orig_script_name TSRMLS_CC);
+										old = env_script_name[snlen-slen];
+										env_script_name[snlen-slen] = 0;
+										_sapi_cgibin_putenv("SCRIPT_NAME", env_script_name TSRMLS_CC);
+										env_script_name[snlen-slen] = old;
+									}
 								}
 								env_path_info = _sapi_cgibin_putenv("PATH_INFO", path_info TSRMLS_CC);
 							}