Date: Wednesday, July 5, 2017 @ 23:10:52 Author: anatolik Revision: 299732
FS#54633 Revert changes that break SCRIPT_NAME Added: apache/trunk/script_name.patch Modified: apache/trunk/PKGBUILD -------------------+ PKGBUILD | 9 ++++- script_name.patch | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-07-05 21:58:07 UTC (rev 299731) +++ PKGBUILD 2017-07-05 23:10:52 UTC (rev 299732) @@ -5,7 +5,7 @@ pkgname=apache pkgver=2.4.26 -pkgrel=2 +pkgrel=3 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64') url='http://www.apache.org/dist/httpd' @@ -34,6 +34,7 @@ httpd.service arch.layout nohttp2forprefork.patch # https://github.com/apache/httpd/commit/ab03196a879f4064f618a9a45d63c67a67f4b901 + script_name.patch # https://github.com/apache/httpd/commit/7806711b85b46c3caad150c8fde97f29f32ae6f8 ) sha256sums=('a07eb52fafc879e0149d31882f7da63173e72df4478db4dc69f7a775b663d387' 'SKIP' @@ -42,7 +43,8 @@ '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16' 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960' 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3' - '25d297199c536ccfdb2c4d92988a74113ac2e14261090b5c1d3ac01537c5c742') + '25d297199c536ccfdb2c4d92988a74113ac2e14261090b5c1d3ac01537c5c742' + '9500789503c0e78e12bfc14901dbb276564f2b48b24c614aa1bb9987fc351f5e') validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski prepare() { @@ -60,6 +62,9 @@ # https://bugs.archlinux.org/task/54666 patch -Np1 -i ../nohttp2forprefork.patch + + # https://bugs.archlinux.org/task/54633 + patch -Np1 -i ../script_name.patch } build() { Added: script_name.patch =================================================================== --- script_name.patch (rev 0) +++ script_name.patch 2017-07-05 23:10:52 UTC (rev 299732) @@ -0,0 +1,84 @@ +From 7806711b85b46c3caad150c8fde97f29f32ae6f8 Mon Sep 17 00:00:00 2001 +From: Jim Jagielski <j...@apache.org> +Date: Mon, 3 Jul 2017 10:22:07 +0000 +Subject: [PATCH] Merge r1800306, r1800393 from trunk: + +proxy_fcgi: remove FPM-specific logic + +Reverts r1780328, r1780329, and their associated followups, which +incorrectly manipulated SCRIPT_NAME by default. All proxy_fcgi.t +regression tests now pass. + +PR: 61202 + +Partial reversal of r1800306... note virtual scripts in notes + +Submitted by: jchampion, jim +Reviewed by: jchampion, jim, covener + + +git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1800618 13f79535-47bb-0310-9956-ffa450edef68 +--- + modules/proxy/mod_proxy_fcgi.c | 32 -------------------------------- + 3 files changed, 4 insertions(+), 39 deletions(-) + +diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c +index a268556e302..41292e87267 100644 +--- a/modules/proxy/mod_proxy_fcgi.c ++++ b/modules/proxy/mod_proxy_fcgi.c +@@ -321,7 +321,6 @@ static apr_status_t send_environment(proxy_conn_rec *conn, request_rec *r, + apr_status_t rv; + apr_size_t avail_len, len, required_len; + int next_elem, starting_elem; +- int fpm = 0; + fcgi_req_config_t *rconf = ap_get_module_config(r->request_config, &proxy_fcgi_module); + fcgi_dirconf_t *dconf = ap_get_module_config(r->per_dir_config, &proxy_fcgi_module); + +@@ -354,8 +353,6 @@ static apr_status_t send_environment(proxy_conn_rec *conn, request_rec *r, + *qs = '\0'; + } + } +- } else { +- fpm = 1; + } + + if (newfname) { +@@ -364,38 +361,9 @@ static apr_status_t send_environment(proxy_conn_rec *conn, request_rec *r, + } + } + +-#if 0 +- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(09999) +- "r->filename: %s", (r->filename ? r->filename : "nil")); +- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(09999) +- "r->uri: %s", (r->uri ? r->uri : "nil")); +- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(09999) +- "r->path_info: %s", (r->path_info ? r->path_info : "nil")); +-#endif +- + ap_add_common_vars(r); + ap_add_cgi_vars(r); + +- if (fpm || apr_table_get(r->notes, "virtual_script")) { +- /* +- * Adjust SCRIPT_NAME, PATH_INFO and PATH_TRANSLATED for PHP-FPM +- * TODO: Right now, PATH_INFO and PATH_TRANSLATED look OK... +- */ +- const char *pend; +- const char *script_name = apr_table_get(r->subprocess_env, "SCRIPT_NAME"); +- pend = script_name + strlen(script_name); +- if (r->path_info && *r->path_info) { +- pend = script_name + ap_find_path_info(script_name, r->path_info) - 1; +- } +- while (pend != script_name && *pend != '/') { +- pend--; +- } +- apr_table_setn(r->subprocess_env, "SCRIPT_NAME", pend); +- ap_log_rerror(APLOG_MARK, APLOG_TRACE4, 0, r, +- "fpm:virtual_script: Modified SCRIPT_NAME to: %s", +- pend); +- } +- + /* XXX are there any FastCGI specific env vars we need to send? */ + + /* Give admins final option to fine-tune env vars */