From: Dan Scott Date: Fri, 19 Jun 2015 18:55:48 +0000 (-0400) Subject: Revert "Merge remote-tracking branch 'working/user/berick/lp1409055-python-https... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d435f958a63a9220a6b12c3329b4cea1311cede9;p=working%2FOpenSRF.git Revert "Merge remote-tracking branch 'working/user/berick/lp1409055-python-https-via-dbs' into https_is_good_24" This reverts commit 530220a8524bed925dacf63a92c6d8a7e4ca7652, reversing changes made to a8ea7468ed180c7c4cc2da3511a61949312ee5bf. --- diff --git a/src/python/osrf/gateway.py b/src/python/osrf/gateway.py index 8796ce2..eda1139 100644 --- a/src/python/osrf/gateway.py +++ b/src/python/osrf/gateway.py @@ -50,18 +50,6 @@ class GatewayRequest: setDefaultHost = staticmethod(setDefaultHost) def buildURL(self): - """ - Builds the URL for the OpenSRF gateway based on the host and path - - Previous versions of the code assumed that the host would be a bare - hostname or IP address, and prepended the http:// protocol. However, - to enable more secure communications, now we check for the existence - of the HTTP or HTTPS prefix and use that if it has been supplied. - """ - - if defaultHost.lower().startswith(('http://', 'https://')): - return '%s/%s' % (defaultHost, self.path) - return 'http://%s/%s' % (defaultHost, self.path) class JSONGatewayRequest(GatewayRequest):