|
 |
13cad3 |
diff --git a/requests/sessions.py b/requests/sessions.py
|
|
|
13cad3 |
index a448bd8..d73d700 100644
|
|
|
13cad3 |
--- a/requests/sessions.py
|
|
|
13cad3 |
+++ b/requests/sessions.py
|
|
|
13cad3 |
@@ -19,7 +19,7 @@ from .cookies import (
|
|
|
13cad3 |
from .models import Request, PreparedRequest, DEFAULT_REDIRECT_LIMIT
|
|
|
13cad3 |
from .hooks import default_hooks, dispatch_hook
|
|
|
13cad3 |
from ._internal_utils import to_native_string
|
|
|
13cad3 |
-from .utils import to_key_val_list, default_headers
|
|
|
13cad3 |
+from .utils import to_key_val_list, default_headers, DEFAULT_PORTS
|
|
|
13cad3 |
from .exceptions import (
|
|
|
13cad3 |
TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError)
|
|
|
13cad3 |
|
|
|
13cad3 |
@@ -128,8 +128,17 @@ class SessionRedirectMixin(object):
|
|
|
13cad3 |
if (old_parsed.scheme == 'http' and old_parsed.port in (80, None)
|
|
|
13cad3 |
and new_parsed.scheme == 'https' and new_parsed.port in (443, None)):
|
|
|
13cad3 |
return False
|
|
|
13cad3 |
+
|
|
|
13cad3 |
+ # Handle default port usage corresponding to scheme.
|
|
|
13cad3 |
+ changed_port = old_parsed.port != new_parsed.port
|
|
|
13cad3 |
+ changed_scheme = old_parsed.scheme != new_parsed.scheme
|
|
|
13cad3 |
+ default_port = (DEFAULT_PORTS.get(old_parsed.scheme, None), None)
|
|
|
13cad3 |
+ if (not changed_scheme and old_parsed.port in default_port
|
|
|
13cad3 |
+ and new_parsed.port in default_port):
|
|
|
13cad3 |
+ return False
|
|
|
13cad3 |
+
|
|
|
13cad3 |
# Standard case: root URI must match
|
|
|
13cad3 |
- return old_parsed.port != new_parsed.port or old_parsed.scheme != new_parsed.scheme
|
|
|
13cad3 |
+ return changed_port or changed_scheme
|
|
|
13cad3 |
|
|
|
13cad3 |
def resolve_redirects(self, resp, req, stream=False, timeout=None,
|
|
|
13cad3 |
verify=True, cert=None, proxies=None, yield_requests=False, **adapter_kwargs):
|
|
|
13cad3 |
diff --git a/requests/utils.py b/requests/utils.py
|
|
|
13cad3 |
index 0ce7fe1..04145c8 100644
|
|
|
13cad3 |
--- a/requests/utils.py
|
|
|
13cad3 |
+++ b/requests/utils.py
|
|
|
13cad3 |
@@ -38,6 +38,8 @@ NETRC_FILES = ('.netrc', '_netrc')
|
|
|
13cad3 |
|
|
|
13cad3 |
DEFAULT_CA_BUNDLE_PATH = certs.where()
|
|
|
13cad3 |
|
|
|
13cad3 |
+DEFAULT_PORTS = {'http': 80, 'https': 443}
|
|
|
13cad3 |
+
|
|
|
13cad3 |
|
|
|
13cad3 |
if sys.platform == 'win32':
|
|
|
13cad3 |
# provide a proxy_bypass version on Windows without DNS lookups
|
|
|
13cad3 |
diff --git a/tests/test_requests.py b/tests/test_requests.py
|
|
|
13cad3 |
index f46561e..f99fdaf 100644
|
|
|
13cad3 |
--- a/tests/test_requests.py
|
|
|
13cad3 |
+++ b/tests/test_requests.py
|
|
|
13cad3 |
@@ -1611,6 +1611,17 @@ class TestRequests:
|
|
|
13cad3 |
s = requests.Session()
|
|
|
13cad3 |
assert s.should_strip_auth('http://example.com:1234/foo', 'https://example.com:4321/bar')
|
|
|
13cad3 |
|
|
|
13cad3 |
+ @pytest.mark.parametrize(
|
|
|
13cad3 |
+ 'old_uri, new_uri', (
|
|
|
13cad3 |
+ ('https://example.com:443/foo', 'https://example.com/bar'),
|
|
|
13cad3 |
+ ('http://example.com:80/foo', 'http://example.com/bar'),
|
|
|
13cad3 |
+ ('https://example.com/foo', 'https://example.com:443/bar'),
|
|
|
13cad3 |
+ ('http://example.com/foo', 'http://example.com:80/bar')
|
|
|
13cad3 |
+ ))
|
|
|
13cad3 |
+ def test_should_strip_auth_default_port(self, old_uri, new_uri):
|
|
|
13cad3 |
+ s = requests.Session()
|
|
|
13cad3 |
+ assert not s.should_strip_auth(old_uri, new_uri)
|
|
|
13cad3 |
+
|
|
|
13cad3 |
def test_manual_redirect_with_partial_body_read(self, httpbin):
|
|
|
13cad3 |
s = requests.Session()
|
|
|
13cad3 |
r1 = s.get(httpbin('redirect/2'), allow_redirects=False, stream=True)
|