From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 14 May 2014 01:05:29 +0000 (-0400)
Subject: Merge branch 'branch3.2'
X-Git-Tag: v4.0.0b1~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a47c2c5eb5b889cbdbad6cd229c29053c1be1490;p=thirdparty%2Ftornado.git

Merge branch 'branch3.2'

Conflicts:
	tornado/tcpserver.py
---

a47c2c5eb5b889cbdbad6cd229c29053c1be1490
diff --cc README.rst
index d24a6ba8c,8b28d5065..680f15f24
--- a/README.rst
+++ b/README.rst
@@@ -75,14 -75,14 +75,14 @@@ copy of the source tarball as well
      sudo python setup.py install
  
  The Tornado source code is `hosted on GitHub
- <https://github.com/facebook/tornado>`_.
+ <https://github.com/tornadoweb/tornado>`_.
  
 -**Prerequisites**: Tornado runs on Python 2.6, 2.7, 3.2, and 3.3.  On
 -Python 2, the `backports.ssl_match_hostname
 +**Prerequisites**: Tornado runs on Python 2.6, 2.7, 3.2, 3.3, and 3.4.  It
 +requires the `certifi <https://pypi.python.org/pypi/certifi>`_ package
 +on all Python versions, and the `backports.ssl_match_hostname
  <https://pypi.python.org/pypi/backports.ssl_match_hostname>`_ package
 -must be installed (This will be installed automatically when using
 -``pip`` or ``easy_install``); on Python 3 there are no strict
 -dependencies outside the standard library.  Some Tornado features may
 +on Python 2.  These will be installed automatically when using
 +``pip`` or ``easy_install``).  Some Tornado features may
  require one of the following optional libraries:
  
  * `unittest2 <https://pypi.python.org/pypi/unittest2>`_ is needed to run
diff --cc docs/index.rst
index d2bcdae3c,4b48cbaac..c122c7f85
--- a/docs/index.rst
+++ b/docs/index.rst
@@@ -84,14 -84,14 +84,14 @@@ copy of the source tarball as well
      sudo python setup.py install
  
  The Tornado source code is `hosted on GitHub
- <https://github.com/facebook/tornado>`_.
+ <https://github.com/tornadoweb/tornado>`_.
  
 -**Prerequisites**: Tornado runs on Python 2.6, 2.7, 3.2, and 3.3.  On
 -Python 2, the `backports.ssl_match_hostname
 +**Prerequisites**: Tornado runs on Python 2.6, 2.7, 3.2, 3.3, and 3.4.  It
 +requires the `certifi <https://pypi.python.org/pypi/certifi>`_ package
 +on all Python versions, and the `backports.ssl_match_hostname
  <https://pypi.python.org/pypi/backports.ssl_match_hostname>`_ package
 -must be installed (This will be installed automatically when using
 -``pip`` or ``easy_install``); on Python 3 there are no strict
 -dependencies outside the standard library.  Some Tornado features may
 +on Python 2.  These will be installed automatically when using
 +``pip`` or ``easy_install``).  Some Tornado features may
  require one of the following optional libraries:
  
  * `unittest2 <https://pypi.python.org/pypi/unittest2>`_ is needed to run
diff --cc tornado/tcpserver.py
index ffe62bc20,9370cbacb..74326c1f1
--- a/tornado/tcpserver.py
+++ b/tornado/tcpserver.py
@@@ -233,8 -230,8 +233,8 @@@ class TCPServer(object)
                  # catch another error later on (AttributeError in
                  # SSLIOStream._do_ssl_handshake).
                  # To test this behavior, try nmap with the -sT flag.
-                 # https://github.com/facebook/tornado/pull/750
+                 # https://github.com/tornadoweb/tornado/pull/750
 -                if err.args[0] in (errno.ECONNABORTED, errno.EINVAL):
 +                if errno_from_exception(err) in (errno.ECONNABORTED, errno.EINVAL):
                      return connection.close()
                  else:
                      raise