proxy/proxy/rhnShared.py | 4 ++--
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit dce0e03f8eb2c539b5523da82dbbfc47cc8d9de3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 30 13:50:56 2010 +0100
Automatic commit of package [spacewalk-proxy] release [1.3.4-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 7a1d4fb..ecc2a1c 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.3.3
+Version: 1.3.4
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -332,6 +332,9 @@ fi
%changelog
+* Tue Nov 30 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.3.4-1
+- 658303 - do not forward Host header, it will confuse target Satellite
+
* Mon Nov 29 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.3.3-1
- 657956 - fix condrestart option (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index c0faec8..bf22327 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.3.3-1 proxy/proxy/
+1.3.4-1 proxy/proxy/
commit 64021b958db3bff2688c89ab8d22ec471e132272
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 30 13:49:07 2010 +0100
658303 - do not forward Host header, it will confuse target Satellite (and
VirtualHosts)
We alredy set Host header previously, so it is already populated.
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index 5871f76..7e8785e 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -328,12 +328,12 @@ class SharedHandler:
# mod_wsgi modifies incoming headers so we have to transform them back
k = k.replace('_','-')
if not (string.lower(k)[:2] == 'x-' or
- string.lower(k) in [
+ string.lower(k) in [ #all but 'host'
'accept', 'accept-charset',
'accept-encoding', 'accept-language',
'accept-ranges', 'age', 'allow',
'authorization', 'cache-control',
'connection', 'content-encoding',
'content-language', 'content-length',
'content-location', 'content-md5',
'content-range', 'content-type',
- 'date', 'etag', 'expect',
'expires', 'from', 'host', 'if-match',
+ 'date', 'etag', 'expect',
'expires', 'from', 'if-match',
'if-modified-since', 'if-none-match',
'if-range', 'if-unmodified-since',
'last-modified', 'location',
'max-forwards', 'pragma', 'proxy-authenticate',
'proxy-authorization', 'range',
'referer', 'retry-after', 'server',