Merge lp:~corey.bryant/ubuntu/utopic/python-eventlet/0.13.0-1ubuntu3.1 into lp:ubuntu/utopic/python-eventlet

[Corey Bryant]

[lp:~corey.bryant/ubuntu/utopic/python-eventlet/0.13.0-1ubuntu3.1]

25. By Corey Bryant on 2015-02-09

debian/patches/socket-timeout.patch: Cherry-pick patch to provide
socket_timeout support (LP: #1419117).

Unmerged revisions

25. By Corey Bryant on 2015-02-09

debian/patches/socket-timeout.patch: Cherry-pick patch to provide
socket_timeout support (LP: #1419117).

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-08 16:22:45 +0000
+++ debian/changelog	2015-02-09 14:32:31 +0000
@@ -1,3 +1,10 @@
+python-eventlet (0.13.0-1ubuntu3.1) UNRELEASED; urgency=medium
+
+  * debian/patches/socket-timeout.patch: Cherry-pick patch to provide
+    socket_timeout support (LP: #1419117).
+
+ -- Corey Bryant <[e-mail]>  Fri, 06 Feb 2015 13:42:06 -0500
+
 python-eventlet (0.13.0-1ubuntu3) utopic; urgency=medium
 
   * Fix build failure with python2.7 and PEP 466.

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-10-08 16:22:45 +0000
+++ debian/patches/series	2015-02-09 14:32:31 +0000
@@ -1,3 +1,4 @@
 skip-failing-tests.patch
 fix-FTBFS-on-sphinx-build.patch
 sslwrap.diff
+socket-timeout.patch

=== added file 'debian/patches/socket-timeout.patch'
--- debian/patches/socket-timeout.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/socket-timeout.patch	2015-02-09 14:32:31 +0000
@@ -0,0 +1,87 @@
+From 7d4916f01462de09cb58853d9de2e85777c2ad5b Mon Sep 17 00:00:00 2001
+From: Sergey Shepelev <[e-mail]>
+Date: Fri, 9 Aug 2013 14:25:10 +0400
+Subject: [PATCH] wsgi: configurable socket_timeout
+
+---
+ eventlet/wsgi.py   | 13 ++++++++++---
+ tests/wsgi_test.py | 11 +++++++++++
+ 2 files changed, 21 insertions(+), 3 deletions(-)
+
+--- a/eventlet/wsgi.py
++++ b/eventlet/wsgi.py
+@@ -535,7 +535,8 @@
+                  log_output=True,
+                  log_format=DEFAULT_LOG_FORMAT,
+                  url_length_limit=MAX_REQUEST_LINE,
+-                 debug=True):
++                 debug=True,
++                 socket_timeout=None):
+ 
+         self.outstanding_requests = 0
+         self.socket = socket
+@@ -556,6 +557,7 @@
+         self.log_format = log_format
+         self.url_length_limit = url_length_limit
+         self.debug = debug
++        self.socket_timeout = socket_timeout
+ 
+     def get_environ(self):
+         d = {
+@@ -609,7 +611,8 @@
+            log_output=True,
+            log_format=DEFAULT_LOG_FORMAT,
+            url_length_limit=MAX_REQUEST_LINE,
+-           debug=True):
++           debug=True,
++           socket_timeout=None):
+     """  Start up a wsgi server handling requests from the supplied server
+     socket.  This function loops forever.  The *sock* object will be closed after server exits,
+     but the underlying file descriptor will remain open, so if you have a dup() of *sock*,
+@@ -631,6 +634,7 @@
+     :param log_format: A python format string that is used as the template to generate log lines.  The following values can be formatted into it: client_ip, date_time, request_line, status_code, body_length, wall_seconds.  The default is a good example of how to use it.
+     :param url_length_limit: A maximum allowed length of the request url. If exceeded, 414 error is returned.
+     :param debug: True if the server should send exception tracebacks to the clients on 500 errors.  If False, the server will respond with empty bodies.
++    :param socket_timeout: Timeout for client connections' socket operations. Default None means wait forever.
+     """
+     serv = Server(sock, sock.getsockname(),
+                   site, log,
+@@ -643,7 +647,9 @@
+                   log_output=log_output,
+                   log_format=log_format,
+                   url_length_limit=url_length_limit,
+-                  debug=debug)
++                  debug=debug,
++                  socket_timeout=socket_timeout,
++                  )
+     if server_event is not None:
+         server_event.send(serv)
+     if max_size is None:
+@@ -669,6 +675,7 @@
+         while True:
+             try:
+                 client_socket = sock.accept()
++                client_socket[0].settimeout(serv.socket_timeout)
+                 if debug:
+                     serv.log.write("(%s) accepted %r\n" % (
+                         serv.pid, client_socket[1]))
+--- a/tests/wsgi_test.py
++++ b/tests/wsgi_test.py
+@@ -1144,6 +1144,17 @@
+         request_thread.wait()
+         server_sock.close()
+ 
++    def test_server_socket_timeout(self):
++        self.spawn_server(socket_timeout=0.1)
++        sock = eventlet.connect(('localhost', self.port))
++        sock.send('GET / HTTP/1.1\r\n')
++        eventlet.sleep(0.1)
++        try:
++            read_http(sock)
++            assert False, 'Expected ConnectionClosed exception'
++        except ConnectionClosed:
++            pass
++
+ 
+ def read_headers(sock):
+     fd = sock.makefile()