rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

Accepting request 460042 from Apache

Browse Source 
- revert an attempt to fix PR 60458
  + httpd-cache-revert-svn1773397.patch

OBS-URL: https://build.opensuse.org/request/show/460042
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=130
This commit is contained in:
Dominique Leuenberger 2017-02-26 16:02:16 +00:00 committed by Git OBS Bridge
commit 158d11498e
3 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 23 14:12:48 UTC 2017 - pgajdos@suse.com
- revert an attempt to fix PR 60458
+ httpd-cache-revert-svn1773397.patch
-------------------------------------------------------------------
Tue Feb 21 07:22:19 UTC 2017 - pgajdos@suse.com

3
apache2.spec
View File

@ -131,6 +131,8 @@ Patch114: httpd-2.4.12-lua-5.2.patch
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 @@ to administrators of web servers in general.
%patch114 -p1
%patch115 -p1
%patch116 -p0
%patch117 -p1
cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
# install READMEs
a=$(basename %{SOURCE22})

38
httpd-cache-revert-svn1773397.patch Normal file
View File

@ -0,0 +1,38 @@
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;