diff --git a/nova/tests/test_wsgi.py b/nova/tests/test_wsgi.py
index 8efee518f738..1f4d5a18a0d3 100644
--- a/nova/tests/test_wsgi.py
+++ b/nova/tests/test_wsgi.py
@@ -171,6 +171,36 @@ class TestWSGIServer(test.NoDBTestCase):
         server.start()
         self.assertEqual(server._pool.size, CONF.wsgi_default_pool_size)
 
+    def test_client_socket_timeout(self):
+        self.flags(client_socket_timeout=5)
+
+        # mocking eventlet spawn method to check it is called with
+        # configured 'client_socket_timeout' value.
+        with mock.patch.object(eventlet,
+                               'spawn') as mock_spawn:
+            server = nova.wsgi.Server("test_app", None,
+                                      host="127.0.0.1", port=0)
+            server.start()
+            _, kwargs = mock_spawn.call_args
+            self.assertEqual(CONF.client_socket_timeout,
+                             kwargs['socket_timeout'])
+            server.stop()
+
+    def test_wsgi_keep_alive(self):
+        self.flags(wsgi_keep_alive=False)
+
+        # mocking eventlet spawn method to check it is called with
+        # configured 'wsgi_keep_alive' value.
+        with mock.patch.object(eventlet,
+                               'spawn') as mock_spawn:
+            server = nova.wsgi.Server("test_app", None,
+                                      host="127.0.0.1", port=0)
+            server.start()
+            _, kwargs = mock_spawn.call_args
+            self.assertEqual(CONF.wsgi_keep_alive,
+                             kwargs['keepalive'])
+            server.stop()
+
 
 class TestWSGIServerWithSSL(test.NoDBTestCase):
     """WSGI server with SSL tests."""
diff --git a/nova/wsgi.py b/nova/wsgi.py
index 8d41d66f90d1..c74731c9137c 100644
--- a/nova/wsgi.py
+++ b/nova/wsgi.py
@@ -69,6 +69,15 @@ wsgi_opts = [
                     "max_header_line may need to be increased when using "
                     "large tokens (typically those generated by the "
                     "Keystone v3 API with big service catalogs)."),
+    cfg.BoolOpt('wsgi_keep_alive',
+                default=True,
+                help="If False, closes the client socket connection "
+                     "explicitly."),
+    cfg.IntOpt('client_socket_timeout', default=0,
+               help="Timeout for client connections' socket operations. "
+                    "If an incoming connection is idle for this number of "
+                    "seconds it will be closed. A value of '0' means "
+                    "wait forever."),
     ]
 CONF = cfg.CONF
 CONF.register_opts(wsgi_opts)
@@ -108,6 +117,7 @@ class Server(object):
         self._wsgi_logger = logging.WritableLogger(self._logger)
         self._use_ssl = use_ssl
         self._max_url_len = max_url_len
+        self.client_socket_timeout = CONF.client_socket_timeout or None
 
         if backlog < 1:
             raise exception.InvalidInput(
@@ -213,7 +223,9 @@ class Server(object):
             'custom_pool': self._pool,
             'log': self._wsgi_logger,
             'log_format': CONF.wsgi_log_format,
-            'debug': False
+            'debug': False,
+            'keepalive': CONF.wsgi_keep_alive,
+            'socket_timeout': self.client_socket_timeout
             }
 
         if self._max_url_len: