From 3ea4485a4b08bfb4e321430a97c1ee8d939c7088 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Sep 2014 11:39:34 +0200 Subject: PHP 5.4.33 --- php-5.4.33-bug65641.patch | 63 +++++++++++++++++++++++++++++++++++++++++++++++ php.spec | 13 ++++++++-- 2 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 php-5.4.33-bug65641.patch diff --git a/php-5.4.33-bug65641.patch b/php-5.4.33-bug65641.patch new file mode 100644 index 0000000..d9b31d1 --- /dev/null +++ b/php-5.4.33-bug65641.patch @@ -0,0 +1,63 @@ +From 8cac75969e5abb2b6be5bbd489d851a4f9e50979 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Mon, 15 Sep 2014 13:29:55 +0200 +Subject: [PATCH] Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME + variable when using Apache + +ProxyPass is unable to provide correct PATH_INFO +as it is not aware of file path (while SetHandler is). + +As we can extract PATH_INFO from PATH_TRANSLATED, +we also need to check if present in SCRIPT_NAME +and remove it. + +After applying this patch. +With mod_php +_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1 +_SERVER["SCRIPT_NAME"] /info.php +_SERVER["PATH_INFO"] /foor/bar +_SERVER["PHP_SELF"] /info.php/foo/bar +_SERVER["QUERY_STRING"] q=1 + +With mod_proxy_fcgi + SetHandler +_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1 +_SERVER["SCRIPT_NAME"] /info.php +_SERVER["PATH_INFO"] /foo/bar +_SERVER["PHP_SELF"] /info.php/foo/bar +_SERVER["QUERY_STRING"] q=1 + +With mod_proxy_fcgi + ProxyPass +_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1 +_SERVER["SCRIPT_NAME"] /info.php +_SERVER["PATH_INFO"] /foo/bar +_SERVER["PHP_SELF"] /info.php/foo/bar +_SERVER["QUERY_STRING"] q=1 +--- + sapi/fpm/fpm/fpm_main.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c +index 56a06f9..331342c 100644 +--- a/sapi/fpm/fpm/fpm_main.c ++++ b/sapi/fpm/fpm/fpm_main.c +@@ -1231,6 +1231,17 @@ static void init_request_info(TSRMLS_D) + SG(request_info).request_uri = orig_script_name; + } + path_info[0] = old; ++ } else if (apache_was_here && env_script_name) { ++ /* Using mod_proxy_fcgi and ProxyPass, apache cannot set PATH_INFO ++ * As we can extract PATH_INFO from PATH_TRANSLATED ++ * 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)) { ++ _sapi_cgibin_putenv("ORIG_SCRIPT_NAME", orig_script_name TSRMLS_CC); ++ env_script_name[snlen-slen] = 0; ++ SG(request_info).request_uri = _sapi_cgibin_putenv("SCRIPT_NAME", env_script_name TSRMLS_CC); ++ } + } + env_path_info = _sapi_cgibin_putenv("PATH_INFO", path_info TSRMLS_CC); + } +-- +1.9.2 + diff --git a/php.spec b/php.spec index 718f5d0..3e94b98 100644 --- a/php.spec +++ b/php.spec @@ -101,12 +101,12 @@ %global db_devel libdb-devel %endif -%global rcver RC1 +#global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: 5.4.33 -Release: 0.1.RC1%{?dist} +Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -153,6 +153,8 @@ Patch47: php-5.4.9-phpinfo.patch Patch91: php-5.3.7-oci8conf.patch # Upstream fixes (100+) +# Backported from 5.5.18 for https://bugs.php.net/65641 +Patch100: php-5.4.33-bug65641.patch # Security fixes (200+) @@ -766,6 +768,7 @@ support for using the enchant library to PHP. %patch91 -p1 -b .remi-oci8 # upstream patches +%patch100 -p1 -b .bug65641 # security patches @@ -1534,6 +1537,12 @@ fi %changelog +* Wed Sep 17 2014 Remi Collet 5.4.33-1 +- Update to 5.4.33 + http://www.php.net/releases/5_4_33.php +- fpm: fix script_name with mod_proxy_fcgi / proxypass + add upstream patch for https://bugs.php.net/65641 + * Fri Sep 5 2014 Remi Collet - 5.4.33-0.1.RC1 - update to 5.4.33RC1 - add system libraries to default include_path -- cgit