diff --git a/Lib/httplib.py b/Lib/httplib.py

index fc8e895..0f43e3a 100644

--- a/Lib/httplib.py

+++ b/Lib/httplib.py

@@ -257,6 +257,10 @@ _contains_disallowed_url_pchar_re = re.compile('[\x00-\x20\x7f-\xff]')

 #  _is_allowed_url_pchars_re = re.compile(r"^[/!$&'()*+,;=:@%a-zA-Z0-9._~-]+$")

 # We are more lenient for assumed real world compatibility purposes.

+# These characters are not allowed within HTTP method names

+# to prevent http header injection.

+_contains_disallowed_method_pchar_re = re.compile('[\x00-\x1f]')

+

 class HTTPMessage(mimetools.Message):

     def addheader(self, key, value):

@@ -931,6 +935,8 @@ class HTTPConnection:

         else:

             raise CannotSendRequest()

+        self._validate_method(method)

+

         # Save the method we use, we need it later in the response phase

         self._method = method

         if not url:

@@ -1016,6 +1022,16 @@ class HTTPConnection:

             # For HTTP/1.0, the server will assume "not chunked"

             pass

+    def _validate_method(self, method):

+        """Validate a method name for putrequest."""

+        # prevent http header injection

+        match = _contains_disallowed_method_pchar_re.search(method)

+        if match:

+            raise ValueError(

+                    "method can't contain control characters. %r "

+                    "(found at least %r)"

+                    % (method, match.group()))

+

     def putheader(self, header, *values):

         """Send a request header line to the server.

diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py

index 9db30cc..6ad1427 100644

--- a/Lib/test/test_httplib.py

+++ b/Lib/test/test_httplib.py

@@ -214,6 +214,29 @@ class HeaderTests(TestCase):

                 conn.putheader(name, value)

+class HttpMethodTests(TestCase):

+    def test_invalid_method_names(self):

+        methods = (

+            'GET\r',

+            'POST\n',

+            'PUT\n\r',

+            'POST\nValue',

+            'POST\nHOST:abc',

+            'GET\nrHost:abc\n',

+            'POST\rRemainder:\r',

+            'GET\rHOST:\n',

+            '\nPUT'

+        )

+

+        for method in methods:

+            with self.assertRaisesRegexp(

+                    ValueError, "method can't contain control characters"):

+                conn = httplib.HTTPConnection('example.com')

+                conn.sock = FakeSocket(None)

+                conn.request(method=method, url="/")

+

+

+

 class BasicTest(TestCase):

     def test_status_lines(self):

         # Test HTTP status lines

@@ -789,9 +812,9 @@ class TunnelTests(TestCase):

 @test_support.reap_threads

 def test_main(verbose=None):

-    test_support.run_unittest(HeaderTests, OfflineTest, BasicTest, TimeoutTest,

-                              HTTPTest, HTTPSTest, SourceAddressTest,

-                               TunnelTests)

+    test_support.run_unittest(HeaderTests, OfflineTest, HttpMethodTests,

+                              BasicTest, TimeoutTest, HTTPTest, HTTPSTest,

+                              SourceAddressTest, TunnelTests)

 if __name__ == '__main__':

     test_main()