simpler

Author: divinity76

sapi/fpm/fpm/fpm_main.c

@@ -1035,17 +1035,8 @@ static void init_request_info(void)
 				/* Copy path portion in place to avoid memory leak.  Note
 				 * that this also affects what script_path_translated points
 				 * to. */
-				size_t plen = strlen(p);
-				memmove(env_script_filename, p, plen + 1);
+				memmove(env_script_filename, p, strlen(p) + 1);
 				apache_was_here = 1;
-				// If DocumentRoot contains cyrillic characters and PHP is invoked with SetHandler (not applicable to ProxyPassMatch),
-				// then the cyrillic characters are urlencoded by apache, and we need to decode them, for example with
-				// DocumentRoot /home/hans/web/cyrillicрф.ratma.net/public_html
-				// env_script_filename contains /home/hans/web/cyrillic%D1%80%D1%84.ratma.net/public_html/index.php.
-				// and we must decode it to /home/hans/web/cyrillicрф.ratma.net/public_html/index.php.
-				if(memchr(env_script_filename, '%', plen) != NULL){
-					plen = php_raw_url_decode(env_script_filename, plen);
-				}
 			}
 			/* ignore query string if sent by Apache (RewriteRule) */
 			p = strchr(env_script_filename, '?');
@@ -1112,6 +1103,16 @@ static void init_request_info(void)
 			script_path_translated = __unixify(script_path_translated, 0, NULL, 1, 0);
 #endif
 
+			// If DocumentRoot contains cyrillic characters and PHP is invoked with SetHandler (not applicable to ProxyPassMatch),
+			// then the cyrillic characters are urlencoded by apache, and we need to decode them, for example with
+			// DocumentRoot /home/hans/web/cyrillicрф.ratma.net/public_html
+			// env_script_filename contains /home/hans/web/cyrillic%D1%80%D1%84.ratma.net/public_html/index.php.
+			// and we must decode it to /home/hans/web/cyrillicрф.ratma.net/public_html/index.php.
+			if (apache_was_here && strchr(script_path_translated, '%'))
+			{
+				php_raw_url_decode(script_path_translated, strlen(script_path_translated));
+			}
+			
 			/*
 			 * if the file doesn't exist, try to extract PATH_INFO out
 			 * of it by stat'ing back through the '/'