rel-eng/packages/spacewalk-web | 2 +-
web/modules/pxt/PXT/Request.pm | 4 +---
web/spacewalk-web.spec | 5 ++++-
3 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 75e490a5ccfcfa2f41e9b711ac0b9cd0df196166
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 9 17:11:14 2011 +0200
Automatic commit of package [spacewalk-web] release [1.6.19-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 1ad392b..a0111a2 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.18-1 web/
+1.6.19-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 2161eda..a2a493c 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.6.18
+Version: 1.6.19
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk/
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Sep 09 2011 Jan Pazdziora 1.6.19-1
+- 616175 - observe the port specified in the URL even for https.
+
* Thu Aug 25 2011 Miroslav Suchý 1.6.18-1
- 705363 - spacewalk-base and spacewalk-base-minimal are now disjunctive
remove the provide from spacewalk-base
commit b841b20725abe312655f0a6799ffa4662eedc56f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 9 17:09:29 2011 +0200
616175 - observe the port specified in the URL even for https.
diff --git a/web/modules/pxt/PXT/Request.pm b/web/modules/pxt/PXT/Request.pm
index b1f4e60..326299e 100644
--- a/web/modules/pxt/PXT/Request.pm
+++ b/web/modules/pxt/PXT/Request.pm
@@ -624,9 +624,7 @@ sub derelative_url {
$url->host(PXT::Config->get('base_domain')) unless $url->host;
- # for base_port; ignore base_port in ssl mode for now, as it
- # probably wouldn't work
- $url->port(PXT::Config->get('base_port')) if
PXT::Config->get('base_port') and not $url->scheme eq 'https';
+ $url->port(PXT::Config->get('base_port')) if
PXT::Config->get('base_port');
return $url;
}