Hello community, here is the log from the commit of package apache2 for openSUSE:Factory checked in at 2017-02-26 17:02:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2 (Old) and /work/SRC/openSUSE:Factory/.apache2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2/apache2.changes 2017-02-22 13:52:36.116279612 +0100 +++ /work/SRC/openSUSE:Factory/.apache2.new/apache2.changes 2017-02-26 17:02:17.419299372 +0100 @@ -1,0 +2,6 @@ +Thu Feb 23 14:12:48 UTC 2017 - pgaj...@suse.com + +- revert an attempt to fix PR 60458 + + httpd-cache-revert-svn1773397.patch + +------------------------------------------------------------------- New: ---- httpd-cache-revert-svn1773397.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.vP9QZK/_old 2017-02-26 17:02:21.726646019 +0100 +++ /var/tmp/diff_new_pack.vP9QZK/_new 2017-02-26 17:02:21.730645412 +0100 @@ -131,6 +131,8 @@ Patch115: httpd-2.4.x-fate317766-config-control-two-protocol-options.diff # https://bz.apache.org/bugzilla/show_bug.cgi?id=60577 comment 5 Patch116: httpd-cache-forward-http-proxy.patch +# http://svn.apache.org/viewvc?view=revision&revision=1781324 +Patch117: httpd-cache-revert-svn1773397.patch BuildRequires: apache-rpm-macros-control BuildRequires: automake BuildRequires: db-devel @@ -323,6 +325,7 @@ %patch114 -p1 %patch115 -p1 %patch116 -p0 +%patch117 -p1 cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE # install READMEs a=$(basename %{SOURCE22}) ++++++ httpd-cache-revert-svn1773397.patch ++++++ Index: httpd-2.4.25/modules/proxy/mod_proxy.c =================================================================== --- httpd-2.4.25.orig/modules/proxy/mod_proxy.c 2016-12-12 16:20:04.000000000 +0100 +++ httpd-2.4.25/modules/proxy/mod_proxy.c 2017-02-23 15:02:21.509606618 +0100 @@ -771,29 +771,18 @@ static int proxy_trans(request_rec *r) */ dconf = ap_get_module_config(r->per_dir_config, &proxy_module); - conf = (proxy_server_conf *) ap_get_module_config(r->server->module_config, - &proxy_module); + /* short way - this location is reverse proxied? */ if (dconf->alias) { int rv = ap_proxy_trans_match(r, dconf->alias, dconf); - if (OK == rv) { - /* Got a hit. Need to make sure it's not explicitly declined */ - if (conf->aliases->nelts) { - ent = (struct proxy_alias *) conf->aliases->elts; - for (i = 0; i < conf->aliases->nelts; i++) { - int rv = ap_proxy_trans_match(r, &ent[i], dconf); - if (DECLINED == rv) { - return DECLINED; - } - } - } - return OK; - } if (DONE != rv) { return rv; } } + conf = (proxy_server_conf *) ap_get_module_config(r->server->module_config, + &proxy_module); + /* long way - walk the list of aliases, find a match */ if (conf->aliases->nelts) { ent = (struct proxy_alias *) conf->aliases->elts;
