From 47abf839607709dc594494bddf2ec63ab7233e6e Mon Sep 17 00:00:00 2001
From: Jeong YunWon <jeong.yunwon@navercorp.com>
Date: Tue, 27 Jun 2017 16:08:35 +0900
Subject: [PATCH 1/8] Protocol configurable gunicorn worker

---
 sanic/worker.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sanic/worker.py b/sanic/worker.py
index 7c02053c..9ca9de90 100644
--- a/sanic/worker.py
+++ b/sanic/worker.py
@@ -22,6 +22,9 @@ from sanic.websocket import WebSocketProtocol
 
 class GunicornWorker(base.Worker):
 
+    http_protocol = HttpProtocol
+    websocket_protocol = WebSocketProtocol
+
     def __init__(self, *args, **kw):  # pragma: no cover
         super().__init__(*args, **kw)
         cfg = self.cfg
@@ -45,8 +48,9 @@ class GunicornWorker(base.Worker):
 
     def run(self):
         is_debug = self.log.loglevel == logging.DEBUG
-        protocol = (WebSocketProtocol if self.app.callable.websocket_enabled
-                    else HttpProtocol)
+        protocol = (
+            self.websocket_protocol if self.app.callable.websocket_enabled
+            else self.http_protocol)
         self._server_settings = self.app.callable._helper(
             loop=self.loop,
             debug=is_debug,
@@ -136,8 +140,7 @@ class GunicornWorker(base.Worker):
                 if self.max_requests and req_count > self.max_requests:
                     self.alive = False
                     self.log.info(
-                            "Max requests exceeded, shutting down: %s", self
-                        )
+                        "Max requests exceeded, shutting down: %s", self)
                 elif pid == os.getpid() and self.ppid != os.getppid():
                     self.alive = False
                     self.log.info("Parent changed, shutting down: %s", self)

From 4578f6016b04a6e850bfe6076f12dd3757164e96 Mon Sep 17 00:00:00 2001
From: lanf0n <lanfon72@gmail.com>
Date: Fri, 13 Oct 2017 16:48:02 +0800
Subject: [PATCH 2/8] to fix condition error that used in `log_response`

`request` class is derived from `dict`, so it will never be `True`.
---
 sanic/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sanic/server.py b/sanic/server.py
index 8f60a864..2d47dc4f 100644
--- a/sanic/server.py
+++ b/sanic/server.py
@@ -311,7 +311,7 @@ class HttpProtocol(asyncio.Protocol):
             else:
                 extra['byte'] = -1
 
-            if self.request:
+            if self.request is not None:
                 extra['host'] = '{0}:{1}'.format(self.request.ip[0],
                                                  self.request.ip[1])
                 extra['request'] = '{0} {1}'.format(self.request.method,

From ea5b07f636451822cbe923a75e6275118f594006 Mon Sep 17 00:00:00 2001
From: Ashley Sommer <ashleysommer@gmail.com>
Date: Mon, 16 Oct 2017 11:05:01 +1000
Subject: [PATCH 3/8] Update websocket protocol to accomodate changes in HTTP
 protocol from https://github.com/channelcat/sanic/pull/939 Fixes
 https://github.com/channelcat/sanic/issues/969

---
 sanic/websocket.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/sanic/websocket.py b/sanic/websocket.py
index e8e9922f..37b13f3c 100644
--- a/sanic/websocket.py
+++ b/sanic/websocket.py
@@ -13,10 +13,18 @@ class WebSocketProtocol(HttpProtocol):
         self.websocket_max_size = websocket_max_size
         self.websocket_max_queue = websocket_max_queue
 
-    def connection_timeout(self):
-        # timeouts make no sense for websocket routes
+    # timeouts make no sense for websocket routes
+    def request_timeout_callback(self):
         if self.websocket is None:
-            super().connection_timeout()
+            super().request_timeout_callback()
+
+    def response_timeout_callback(self):
+        if self.websocket is None:
+            super().response_timeout_callback()
+
+    def keep_alive_timeout_callback(self):
+        if self.websocket is None:
+            super().keep_alive_timeout_callback()
 
     def connection_lost(self, exc):
         if self.websocket is not None:

From e6be3b2313eb7b18fd329eada093ed117906afd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= <szucs.krisztian@gmail.com>
Date: Tue, 17 Oct 2017 16:05:24 +0200
Subject: [PATCH 4/8] include LICENSE file in manifest

---
 MANIFEST.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index 7682c1b6..e52d6670 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,7 @@
 include README.rst
+include MANIFEST.in
+include LICENSE
+include setup.py
 
 recursive-exclude * __pycache__
 recursive-exclude * *.py[co]

From 49f3ba39f94c6ef7a6a4cdf0da6459e2cc5b4d3e Mon Sep 17 00:00:00 2001
From: Ashley Sommer <flubba86@gmail.com>
Date: Wed, 18 Oct 2017 17:52:03 +1000
Subject: [PATCH 5/8] Add Sanic-Plugins-Framework library to Extensions doc

I made a new tool for devs to use for easily and quickly creating Sanic Plugins (extensions), and for application builders to easily use those plugins in their app.
---
 docs/sanic/extensions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sanic/extensions.md b/docs/sanic/extensions.md
index ad9b8156..03feb90c 100644
--- a/docs/sanic/extensions.md
+++ b/docs/sanic/extensions.md
@@ -1,7 +1,7 @@
 # Extensions
 
 A list of Sanic extensions created by the community.
-
+- [Sanic-Plugins-Framework](https://github.com/ashleysommer/sanicpluginsframework): Library for easily creating and using Sanic plugins.
 - [Sessions](https://github.com/subyraman/sanic_session): Support for sessions.
   Allows using redis, memcache or an in memory store.
 - [CORS](https://github.com/ashleysommer/sanic-cors): A port of flask-cors.

From 5bcbc5a33755c872feb1c3e5eb0c9589590a4d9f Mon Sep 17 00:00:00 2001
From: davidtgq <davidtgq@gmail.com>
Date: Thu, 19 Oct 2017 19:43:07 -0400
Subject: [PATCH 6/8] Replaced COMMON_STATUS_CODES with a simple 200 check for
 more fast (#982)

* Replaced COMMON_STATUS_CODES with a simple 200 check for more fast

* Added IPware algorithm

* Remove HTTP prefix from Django-style headers
Remove right_most_proxy because it's outside spec

* Remove obvious docstrings

* Revert "Replaced COMMON_STATUS_CODES with a simple 200 check for more fast"

This reverts commit 15b6980

* Revert "Added IPware algorithm"

This reverts commit bdf66cb

WTF HOW DO I GIT

* Revert "Revert "Replaced COMMON_STATUS_CODES with a simple 200 check for more fast""

This reverts commit d8df095

* Revert "Added IPware algorithm"

This reverts commit bdf66cb

* Delete ip.py
---
 sanic/exceptions.py |  5 ++---
 sanic/response.py   | 26 +++++++++-----------------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/sanic/exceptions.py b/sanic/exceptions.py
index e2d808f7..aa1e0d4d 100644
--- a/sanic/exceptions.py
+++ b/sanic/exceptions.py
@@ -1,4 +1,4 @@
-from sanic.response import ALL_STATUS_CODES, COMMON_STATUS_CODES
+from sanic.response import STATUS_CODES
 
 TRACEBACK_STYLE = '''
     <style>
@@ -275,8 +275,7 @@ def abort(status_code, message=None):
                     in response.py for the given status code.
     """
     if message is None:
-        message = COMMON_STATUS_CODES.get(status_code,
-                                          ALL_STATUS_CODES.get(status_code))
+        message = STATUS_CODES.get(status_code)
         # These are stored as bytes in the STATUS_CODES dict
         message = message.decode('utf8')
     sanic_exception = _sanic_exceptions.get(status_code, SanicException)
diff --git a/sanic/response.py b/sanic/response.py
index 582e11cf..86f50038 100644
--- a/sanic/response.py
+++ b/sanic/response.py
@@ -10,13 +10,7 @@ from aiofiles import open as open_async
 
 from sanic.cookies import CookieJar
 
-COMMON_STATUS_CODES = {
-    200: b'OK',
-    400: b'Bad Request',
-    404: b'Not Found',
-    500: b'Internal Server Error',
-}
-ALL_STATUS_CODES = {
+STATUS_CODES = {
     100: b'Continue',
     101: b'Switching Protocols',
     102: b'Processing',
@@ -162,11 +156,10 @@ class StreamingHTTPResponse(BaseHTTPResponse):
 
         headers = self._parse_headers()
 
-        # Try to pull from the common codes first
-        # Speeds up response rate 6% over pulling from all
-        status = COMMON_STATUS_CODES.get(self.status)
-        if not status:
-            status = ALL_STATUS_CODES.get(self.status)
+        if self.status is 200:
+            status = b'OK'
+        else:
+            status = STATUS_CODES.get(self.status)
 
         return (b'HTTP/%b %d %b\r\n'
                 b'%b'
@@ -209,11 +202,10 @@ class HTTPResponse(BaseHTTPResponse):
 
         headers = self._parse_headers()
 
-        # Try to pull from the common codes first
-        # Speeds up response rate 6% over pulling from all
-        status = COMMON_STATUS_CODES.get(self.status)
-        if not status:
-            status = ALL_STATUS_CODES.get(self.status, b'UNKNOWN RESPONSE')
+        if self.status is 200:
+            status = b'OK'
+        else:
+            status = STATUS_CODES.get(self.status, b'UNKNOWN RESPONSE')
 
         return (b'HTTP/%b %d %b\r\n'
                 b'Connection: %b\r\n'

From c2191153cf856da85fcc5f6bc1ce9b15a233ac39 Mon Sep 17 00:00:00 2001
From: Raphael Deem <raphael.deem@gmail.com>
Date: Mon, 23 Oct 2017 21:01:44 -0700
Subject: [PATCH 7/8] remove port from ip

---
 docs/sanic/request_data.md |  4 ++++
 sanic/request.py           | 25 +++++++++++++++++++++----
 tests/test_requests.py     | 10 ++++++++++
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/docs/sanic/request_data.md b/docs/sanic/request_data.md
index e778faf6..4f6bc970 100644
--- a/docs/sanic/request_data.md
+++ b/docs/sanic/request_data.md
@@ -75,6 +75,10 @@ The following variables are accessible as properties on `Request` objects:
 
 - `ip` (str) - IP address of the requester.
 
+- `port` (str) - Port address of the requester.
+
+- `socket` (tuple) - (IP, port) of the requester.
+
 - `app` - a reference to the Sanic application object that is handling this request. This is useful when inside blueprints or other handlers in modules that do not have access to the global `app` object.
 
   ```python
diff --git a/sanic/request.py b/sanic/request.py
index 26f19baf..d4f6dc6f 100644
--- a/sanic/request.py
+++ b/sanic/request.py
@@ -46,7 +46,8 @@ class Request(dict):
     __slots__ = (
         'app', 'headers', 'version', 'method', '_cookies', 'transport',
         'body', 'parsed_json', 'parsed_args', 'parsed_form', 'parsed_files',
-        '_ip', '_parsed_url', 'uri_template', 'stream', '_remote_addr'
+        '_ip', '_parsed_url', 'uri_template', 'stream', '_remote_addr',
+        '_socket', '_port'
     )
 
     def __init__(self, url_bytes, headers, version, method, transport):
@@ -167,11 +168,27 @@ class Request(dict):
 
     @property
     def ip(self):
-        if not hasattr(self, '_ip'):
-            self._ip = (self.transport.get_extra_info('peername') or
-                        (None, None))
+        if not hasattr(self, '_socket'):
+            self._get_address()
         return self._ip
 
+    @property
+    def port(self):
+        if not hasattr(self, '_socket'):
+            self._get_address()
+        return self._port
+
+    @property
+    def socket(self):
+        if not hasattr(self, '_socket'):
+            self._get_socket()
+        return self._socket
+
+    def _get_address(self):
+        self._socket = (self.transport.get_extra_info('peername') or
+                        (None, None))
+        self._ip, self._port = self._socket
+
     @property
     def remote_addr(self):
         """Attempt to return the original client ip based on X-Forwarded-For.
diff --git a/tests/test_requests.py b/tests/test_requests.py
index f0696c7f..e47520c4 100644
--- a/tests/test_requests.py
+++ b/tests/test_requests.py
@@ -27,6 +27,16 @@ def test_sync():
 
     assert response.text == 'Hello'
 
+def test_remote_address():
+    app = Sanic('test_text')
+
+    @app.route('/')
+    def handler(request):
+        return text("{}".format(request.ip))
+
+    request, response = app.test_client.get('/')
+
+    assert response.text == '127.0.0.1'
 
 def test_text():
     app = Sanic('test_text')

From 5bf722c7ae1eab214cc54db2d48b3d47b89ec3de Mon Sep 17 00:00:00 2001
From: Raphael Deem <raphael.deem@gmail.com>
Date: Wed, 25 Oct 2017 21:58:31 -0700
Subject: [PATCH 8/8] remove bare exceptions

---
 sanic/app.py      | 4 ++--
 sanic/response.py | 2 +-
 sanic/server.py   | 2 +-
 sanic/testing.py  | 4 ++--
 sanic/worker.py   | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sanic/app.py b/sanic/app.py
index 8f70b6e7..0f2141c2 100644
--- a/sanic/app.py
+++ b/sanic/app.py
@@ -574,7 +574,7 @@ class Sanic:
             try:
                 response = await self._run_response_middleware(request,
                                                                response)
-            except:
+            except BaseException:
                 error_logger.exception(
                     'Exception occured in one of response middleware handlers'
                 )
@@ -642,7 +642,7 @@ class Sanic:
                 serve(**server_settings)
             else:
                 serve_multiple(server_settings, workers)
-        except:
+        except BaseException:
             error_logger.exception(
                 'Experienced exception while trying to serve')
             raise
diff --git a/sanic/response.py b/sanic/response.py
index 86f50038..3873d90f 100644
--- a/sanic/response.py
+++ b/sanic/response.py
@@ -3,7 +3,7 @@ from os import path
 
 try:
     from ujson import dumps as json_dumps
-except:
+except BaseException:
     from json import dumps as json_dumps
 
 from aiofiles import open as open_async
diff --git a/sanic/server.py b/sanic/server.py
index 049440dd..a475fd98 100644
--- a/sanic/server.py
+++ b/sanic/server.py
@@ -588,7 +588,7 @@ def serve(host, port, request_handler, error_handler, before_start=None,
 
     try:
         http_server = loop.run_until_complete(server_coroutine)
-    except:
+    except BaseException:
         logger.exception("Unable to start server")
         return
 
diff --git a/sanic/testing.py b/sanic/testing.py
index 5d233d7b..ef54537b 100644
--- a/sanic/testing.py
+++ b/sanic/testing.py
@@ -76,14 +76,14 @@ class SanicTestClient:
             try:
                 request, response = results
                 return request, response
-            except:
+            except BaseException:
                 raise ValueError(
                     "Request and response object expected, got ({})".format(
                         results))
         else:
             try:
                 return results[-1]
-            except:
+            except BaseException:
                 raise ValueError(
                     "Request object expected, got ({})".format(results))
 
diff --git a/sanic/worker.py b/sanic/worker.py
index a102fb72..79c0a17d 100644
--- a/sanic/worker.py
+++ b/sanic/worker.py
@@ -74,13 +74,13 @@ class GunicornWorker(base.Worker):
             trigger_events(self._server_settings.get('before_stop', []),
                            self.loop)
             self.loop.run_until_complete(self.close())
-        except:
+        except BaseException:
             traceback.print_exc()
         finally:
             try:
                 trigger_events(self._server_settings.get('after_stop', []),
                                self.loop)
-            except:
+            except BaseException:
                 traceback.print_exc()
             finally:
                 self.loop.close()