From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 7 May 2012 01:30:16 +0000 (-0700)
Subject: Merge remote-tracking branch 'screeley/master'
X-Git-Tag: v2.3.0~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91ea775747f229a3d6981c2628a8a8c4e83a8abb;p=thirdparty%2Ftornado.git

Merge remote-tracking branch 'screeley/master'

Conflicts:
	tornado/simple_httpclient.py
---

91ea775747f229a3d6981c2628a8a8c4e83a8abb
diff --cc tornado/simple_httpclient.py
index 155012fcc,ec3adf50d..80b3fb052
--- a/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
@@@ -123,7 -121,7 +123,7 @@@ class SimpleAsyncHTTPClient(AsyncHTTPCl
  
  
  class _HTTPConnection(object):
-     _SUPPORTED_METHODS = set(["GET", "HEAD", "POST", "PATCH", "PUT", "DELETE"])
 -    _SUPPORTED_METHODS = set(["GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS"])
++    _SUPPORTED_METHODS = set(["GET", "HEAD", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"])
  
      def __init__(self, io_loop, client, request, release_callback,
                   final_callback, max_buffer_size):