From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 17 Jan 2015 21:39:29 +0000 (-0500)
Subject: Merge branch 'log_future'
X-Git-Tag: v4.1.0b1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93ceedfcc8b274c919b3d53a6692631d2f08ba65;p=thirdparty%2Ftornado.git

Merge branch 'log_future'
---

93ceedfcc8b274c919b3d53a6692631d2f08ba65
diff --cc tornado/test/iostream_test.py
index bc69f1d00,5d13184ba..2a7e74b31
--- a/tornado/test/iostream_test.py
+++ b/tornado/test/iostream_test.py
@@@ -880,24 -881,10 +881,26 @@@ class TestIOStreamStartTLS(AsyncTestCas
          with ExpectLog(gen_log, "SSL Error"):
              with self.assertRaises(ssl.SSLError):
                  yield client_future
+         with self.assertRaises(ssl.SSLError):
+             yield server_future
  
  
 +    @unittest.skipIf(not hasattr(ssl, 'create_default_context'),
 +                     'ssl.create_default_context not present')
 +    @gen_test
 +    def test_check_hostname(self):
 +        # Test that server_hostname parameter to start_tls is being used.
 +        # The check_hostname functionality is only available in python 2.7 and
 +        # up and in python 3.4 and up.
 +        self.server_start_tls(_server_ssl_options())
 +        client_future = self.client_start_tls(
 +            ssl.create_default_context(),
 +            server_hostname=b'127.0.0.1')
 +        with ExpectLog(gen_log, "SSL Error"):
 +            with self.assertRaises(ssl.SSLError):
 +                yield client_future
 +
 +
  @skipIfNonUnix
  class TestPipeIOStream(AsyncTestCase):
      def test_pipe_iostream(self):
diff --cc tornado/web.py
index 1080dea2d,fb4d439ad..df957c26f
mode 100644,100755..100644
--- a/tornado/web.py
+++ b/tornado/web.py