|
 |
6a82bf |
diff --git a/src/urllib3/connection.py b/src/urllib3/connection.py
|
|
|
6a82bf |
index 02b3665..1ab1890 100644
|
|
|
6a82bf |
--- a/src/urllib3/connection.py
|
|
|
6a82bf |
+++ b/src/urllib3/connection.py
|
|
|
6a82bf |
@@ -1,4 +1,5 @@
|
|
|
6a82bf |
from __future__ import absolute_import
|
|
|
6a82bf |
+import re
|
|
|
6a82bf |
import datetime
|
|
|
6a82bf |
import logging
|
|
|
6a82bf |
import os
|
|
|
6a82bf |
@@ -61,6 +62,8 @@ port_by_scheme = {
|
|
|
6a82bf |
# after 2016-01-01 (today - 2 years) AND before 2017-07-01 (today - 6 months)
|
|
|
6a82bf |
RECENT_DATE = datetime.date(2017, 6, 30)
|
|
|
6a82bf |
|
|
|
6a82bf |
+_CONTAINS_CONTROL_CHAR_RE = re.compile(r"[^-!#$%&'*+.^_`|~0-9a-zA-Z]")
|
|
|
6a82bf |
+
|
|
|
6a82bf |
|
|
|
6a82bf |
class DummyConnection(object):
|
|
|
6a82bf |
"""Used to detect a failed ConnectionCls import."""
|
|
|
6a82bf |
@@ -181,6 +184,17 @@ class HTTPConnection(_HTTPConnection, object):
|
|
|
6a82bf |
conn = self._new_conn()
|
|
|
6a82bf |
self._prepare_conn(conn)
|
|
|
6a82bf |
|
|
|
6a82bf |
+ def putrequest(self, method, url, *args, **kwargs):
|
|
|
6a82bf |
+ """Send a request to the server"""
|
|
|
6a82bf |
+ match = _CONTAINS_CONTROL_CHAR_RE.search(method)
|
|
|
6a82bf |
+ if match:
|
|
|
6a82bf |
+ raise ValueError(
|
|
|
6a82bf |
+ "Method cannot contain non-token characters %r (found at least %r)"
|
|
|
6a82bf |
+ % (method, match.group())
|
|
|
6a82bf |
+ )
|
|
|
6a82bf |
+
|
|
|
6a82bf |
+ return _HTTPConnection.putrequest(self, method, url, *args, **kwargs)
|
|
|
6a82bf |
+
|
|
|
6a82bf |
def request_chunked(self, method, url, body=None, headers=None):
|
|
|
6a82bf |
"""
|
|
|
6a82bf |
Alternative to the common request method, which sends the
|