proxy/proxy/httpd-conf/spacewalk-proxy-python.conf | 86 ---------------------
proxy/proxy/rhnShared.py | 8 +
proxy/proxy/spacewalk-proxy.spec | 26 +-----
rel-eng/packages/spacewalk-proxy | 2
4 files changed, 13 insertions(+), 109 deletions(-)
New commits:
commit 9e1eb18c855f993c55dfb49ae1f68bcbcef49a3b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Sep 2 11:32:44 2013 +0200
Automatic commit of package [spacewalk-proxy] release [2.0.2-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index ab43658..ccf32d8 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.0.1
+Version: 2.0.2
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -311,6 +311,11 @@ fi
%changelog
+* Mon Sep 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.0.2-1
+- 1002007 - don't send empty data
+- 1002007 - python 2.4 HTTPConnection can't read directly from object
+- 1002007 - use mod_wsgi even on RHEL5
+
* Wed Jul 17 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.0.1-1
- Bumping package versions for 2.0.
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 651d1fe..dff4411 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-2.0.1-1 proxy/proxy/
+2.0.2-1 proxy/proxy/
commit 83354a39706cdeedd7ca3d8b6cbf8db5d24c75ea
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 30 14:38:00 2013 +0200
fixed pylint error
(cherry picked from commit eaaa9d48395d4b1b706ee0b48d366f66e9926fda)
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index 81e76aa..38017ee 100644
--- a/proxy/proxy/rhnShared.py
+++ b/proxy/proxy/rhnShared.py
@@ -363,7 +363,7 @@ class SharedHandler:
# Send the body too if there is a body
if size > 0:
- if sys.version_info < (2,6):
+ if sys.version_info < (2, 6):
data = self.req.headers_in['wsgi.input'].read(size)
else:
data = self.req.headers_in['wsgi.input']
commit c3713afe87701ee301f3a5583eca442e3fb4688a
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')
(cherry picked from commit cd5f85734304214dc40470b5e4ef6b96c89ffc47)
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index 43b931f..81e76aa 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 d8ababbdaae305d5ebc28d8082e7a40b9c48d1be
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
(cherry picked from commit a668455d94efcbba5de8c44930d01d27448c81fe)
diff --git a/proxy/proxy/rhnShared.py b/proxy/proxy/rhnShared.py
index 82ddb16..43b931f 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
commit 886d9b5ff56c275e249a06fdd04736f6aa06b7b8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Aug 30 09:51:57 2013 +0200
1002007 - use mod_wsgi even on RHEL5
(cherry picked from commit 34c3e9c2c0177345a8f0c0ce2a2a9757e136ec67)
diff --git a/proxy/proxy/httpd-conf/spacewalk-proxy-python.conf
b/proxy/proxy/httpd-conf/spacewalk-proxy-python.conf
deleted file mode 100644
index 884cbe4..0000000
--- a/proxy/proxy/httpd-conf/spacewalk-proxy-python.conf
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Spacewalk proxy
-#
-
-<LocationMatch "^/*">
- # this stanza contains all the handlers for RHN app code
-
- # added for oracle
- SetEnv NLS_LANG english.UTF8
-
- # mod_python
- <IfModule !mod_python.c>
- LoadModule python_module modules/mod_python.so
- AddModule mod_python.c
- </IfModule>
-
- PythonPath "sys.path+['/usr/share/rhn']"
- PythonDebug Off
-
- SetHandler python-program
- # all of these handlers are defined in apacheServer
- PythonHeaderParserHandler proxy.apacheServer::HeaderParserHandler
- PythonHandler proxy.apacheServer::Handler
- PythonCleanupHandler proxy.apacheServer::CleanupHandler
- DefaultType text/xml
-
- DirectoryIndex _rhn_proxy/index.html index.html index.htm index.html.var index.shtml
index.php index.php4 index.php3 index.phtml index.cgi
-
-</LocationMatch>
-
-#
-# Spacewalk proxy broker
-#
-
-<Location /XMLRPC>
- SetHandler python-program
- # all of these handlers are defined in apacheServer
- PythonHeaderParserHandler proxy.apacheServer::HeaderParserHandler
- PythonHandler proxy.apacheServer::Handler
- PythonCleanupHandler proxy.apacheServer::CleanupHandler
- PythonOption RHNComponentType proxy.broker
- DefaultType text/xml
- # Uncomment (and edit) the following to limit access to this proxy's
- # services
- #<Limit GET POST>
- # Order allow,deny
- # Allow from
goodguys.com
- #</Limit>
-</Location>
-
-#
-# Spacewalk proxy SSL redirect
-#
-
-<Location /XMLRPC_SSL>
- SetHandler python-program
- # all of these handlers are defined in apacheServer
- PythonHeaderParserHandler proxy.apacheServer::HeaderParserHandler
- PythonHandler proxy.apacheServer::Handler
- PythonCleanupHandler proxy.apacheServer::CleanupHandler
- PythonOption RHNComponentType proxy.redirect
- DefaultType text/xml
- # Uncomment (and edit) the following to limit access to this proxy's
- # services
- #<Limit GET POST>
- # Order allow,deny
- # Allow from
goodguys.com
- #</Limit>
-</Location>
-
-<Location /XMLRPC_REDIRECT>
- SetHandler python-program
- # all of these handlers are defined in apacheServer
- PythonHeaderParserHandler proxy.apacheServer::HeaderParserHandler
- PythonHandler proxy.apacheServer::Handler
- PythonCleanupHandler proxy.apacheServer::CleanupHandler
- PythonOption RHNComponentType proxy.redirect
- DefaultType text/xml
- # Uncomment (and edit) the following to limit access to this proxy's
- # services
- #<Limit GET POST>
- # Order allow,deny
- # Allow from
goodguys.com
- #</Limit>
-</Location>
-
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 7e082ac..ab43658 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -72,11 +72,7 @@ Requires: spacewalk-proxy-package-manager
Requires: spacewalk-ssl-cert-check
Requires: httpd
Requires: mod_ssl
-%if 0%{?rhel} && 0%{?rhel} < 6
-Requires: mod_python
-%else
Requires: mod_wsgi
-%endif
Requires(post): %{name}-common
Conflicts: %{name}-redirect < %{version}-%{release}
Conflicts: %{name}-redirect > %{version}-%{release}
@@ -116,11 +112,7 @@ between an Spacewalk Proxy Server and parent Spacewalk server.
Group: Applications/Internet
Summary: Modules shared by Spacewalk Proxy components
Requires: mod_ssl
-%if 0%{?rhel} && 0%{?rhel} < 6
-Requires: mod_python
-%else
Requires: mod_wsgi
-%endif
Requires: %{name}-broker >= %{version}
Requires: spacewalk-backend >= 1.7.24
Requires: policycoreutils
@@ -172,13 +164,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/spool/rhn-proxy/list
touch $RPM_BUILD_ROOT/%{httpdconf}/cobbler-proxy.conf
-%if 0%{?rhel} && 0%{?rhel} < 6
-rm -fv $RPM_BUILD_ROOT%{httpdconf}/spacewalk-proxy-wsgi.conf
-rm -rfv $RPM_BUILD_ROOT%{rhnroot}/wsgi/
-%else
-rm -fv $RPM_BUILD_ROOT%{httpdconf}/spacewalk-proxy-python.conf
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -301,13 +286,9 @@ fi
%attr(644,root,apache) %config %{httpdconf}/spacewalk-proxy.conf
# this file is created by either cli or webui installer
%ghost %config %{httpdconf}/cobbler-proxy.conf
-%if 0%{?rhel} && 0%{?rhel} < 6
-%attr(644,root,apache) %config %{httpdconf}/spacewalk-proxy-python.conf
-%else
%attr(644,root,apache) %config %{httpdconf}/spacewalk-proxy-wsgi.conf
%{rhnroot}/wsgi/xmlrpc.py*
%{rhnroot}/wsgi/xmlrpc_redirect.py*
-%endif
# the cache
%attr(750,apache,root) %dir %{_var}/cache/rhn
%attr(750,apache,root) %dir %{_var}/cache/rhn/proxy-auth