Merge remote-tracking branch 'amorton/master'

Conflicts:
	tornado/test/simple_httpclient_test.py

diff --cc tornado/simple_httpclient.py
Simple merge

diff --cc tornado/test/simple_httpclient_test.py
index a65c8c687a67cc3f478623bf0382a72bb99c5846,a87fb03be2df1407bc14dd8e941358ec0962eca3..f0f9be0fb166ccb3dd7fc5824937c757aebb6a99
--- 1/tornado/test/simple_httpclient_test.py
--- 2/tornado/test/simple_httpclient_test.py
+++ b/tornado/test/simple_httpclient_test.py
@@@ -44,21 -44,17 +44,31 @@@ class ContentLengthHandler(RequestHandl
          self.set_header("Content-Length", self.get_argument("value"))
          self.write("ok")
  
 +class HeadHandler(RequestHandler):
 +    def head(self):
 +        self.set_header("Content-Length", "7")
 +
 +class NoContentHandler(RequestHandler):
 +    def get(self):
 +        if self.get_argument("error", None):
 +            self.set_header("Content-Length", "7")
 +        self.set_status(204)
 +
+ class SeeOther303PostHandler(RequestHandler):
+     def post(self):
+         self.set_header("Location", "/303_get")
+         self.set_status(303)
+ 
+ class SeeOther303GetHandler(RequestHandler):    
+     def get(self):
+         self.write("ok")
+         
+         
  class SimpleHTTPClientTestCase(AsyncHTTPTestCase, LogTrapTestCase):
 +    def setUp(self):
 +        super(SimpleHTTPClientTestCase, self).setUp()
 +        self.http_client = SimpleAsyncHTTPClient(self.io_loop)
 +
      def get_app(self):
          # callable objects to finish pending /trigger requests
          self.triggers = collections.deque()
@@@ -70,8 -66,8 +80,10 @@@
              url("/hang", HangHandler),
              url("/hello", HelloWorldHandler),
              url("/content_length", ContentLengthHandler),
 +            url("/head", HeadHandler),
 +            url("/no_content", NoContentHandler),
+             url("/303_post", SeeOther303PostHandler),
+             url("/303_get", SeeOther303GetHandler),
              ], gzip=True)
  
      def test_singleton(self):