7:27 a.m.
proxy/proxy/rhnShared.py | 8 ++++++--
proxy/proxy/spacewalk-proxy.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit dafdc3d2245f8f8ec02ddbe92be316a3ab2505a8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 30 14:27:48 2013 +0200
Automatic commit of package [spacewalk-proxy] release [2.1.9-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index d2e51d4..48ca81a 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: 2.1.8
+Version: 2.1.9
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -312,6 +312,10 @@ fi
%changelog
+* Fri Aug 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.9-1
+- 1002007 - don't send empty data
+- 1002007 - python 2.4 HTTPConnection can't read directly from object
+
* Fri Aug 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.8-1
- 1002007 - use mod_wsgi even on RHEL5
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 61bb848..a54daa2 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-2.1.8-1 proxy/proxy/
+2.1.9-1 proxy/proxy/
commit cd5f85734304214dc40470b5e4ef6b96c89ffc47
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 30 14:24:06 2013 +0200
1002007 - don't send empty data
addressing
Traceback (most recent call last):
File "/usr/share/rhn/proxy/apacheServer.py", line 62, in __call__
ret = f(req)
File "/usr/share/rhn/proxy/apacheHandler.py", line 355, in handler
ret = handlerObj.handler()
File "/usr/share/rhn/proxy/redirect/rhnRedirect.py", line 92, in handler
status = self._serverCommo() # part 2
File "/usr/share/rhn/proxy/rhnShared.py", line 201, in _serverCommo
status, headers, bodyFd = self._proxy2server()
File "/usr/share/rhn/proxy/rhnShared.py", line 370, in _proxy2server
http_connection.send(data)
File "/usr/lib64/python2.4/httplib.py", line 664, in send
self.sock.sendall(str)
File "/usr/lib/python2.4/site-packages/rhn/SSL.py", line 217, in write
sent = self._connection.send(data)
SysCallError: (-1, 'Unexpected EOF')
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index 8f29bd0..157a427 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -362,7 +362,7 @@ class SharedHandler:
http_connection.endheaders()
# Send the body too if there is a body
- if size != 0:
+ if size > 0:
if sys.version_info < (2,6):
data = self.req.headers_in['wsgi.input'].read(size)
else:
commit a668455d94efcbba5de8c44930d01d27448c81fe
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 30 14:20:32 2013 +0200
1002007 - python 2.4 HTTPConnection can't read directly from object
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index 137e438..8f29bd0 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -363,7 +363,11 @@ class SharedHandler:
# Send the body too if there is a body
if size != 0:
- http_connection.send(self.req.headers_in['wsgi.input'])
+ if sys.version_info < (2,6):
+ data = self.req.headers_in['wsgi.input'].read(size)
+ else:
+ data = self.req.headers_in['wsgi.input']
+ http_connection.send(data)
# At this point everything is sent to the server
# We now wait for the response