From 94e6220473c9ae968b16e7048c5ed9d9a94113a8 Mon Sep 17 00:00:00 2001 From: Alexandre Fiori Date: Wed, 16 Nov 2011 21:36:54 -0500 Subject: [PATCH] updated version to 0.7 and http "Server" header to "cyclone" --- cyclone/__init__.py | 2 +- cyclone/web.py | 8 ++++---- setup.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cyclone/__init__.py b/cyclone/__init__.py index 6c1661daa1..670a9f012d 100644 --- a/cyclone/__init__.py +++ b/cyclone/__init__.py @@ -16,4 +16,4 @@ # under the License. __author__ = "Alexandre Fiori" -__version__ = "0.6-rc2" +__version__ = "0.7" diff --git a/cyclone/web.py b/cyclone/web.py index 721e770116..ae3cc76624 100644 --- a/cyclone/web.py +++ b/cyclone/web.py @@ -112,7 +112,7 @@ def on_connection_close(self, *args, **kwargs): def clear(self): """Resets all headers and content for this response.""" self._headers = { - "Server": "CycloneServer/" + __version__, + "Server": "cyclone/" + __version__, "Content-Type": "text/html; charset=UTF-8", } if not self.request.supports_http_1_1(): @@ -972,7 +972,7 @@ def _rawDataReceived(self, data): "HTTP/1.1 101 Web Socket Protocol Handshake\r\n" "Upgrade: WebSocket\r\n" "Connection: Upgrade\r\n" - "Server: CycloneServer/"+__version__+"\r\n" + "Server: cyclone/"+__version__+"\r\n" "Sec-WebSocket-Origin: " + self.request.headers["Origin"] + "\r\n" "Sec-WebSocket-Location: ws://" + self.request.host + self.request.path + "\r\n\r\n"+token+"\r\n") @@ -1094,7 +1094,7 @@ def _execute(self, transforms, *args, **kwargs): "Upgrade: WebSocket\r\n" "Connection: Upgrade\r\n" "Sec-WebSocket-Accept: " + accept + "\r\n" - "Server: CycloneServer/" +__version__+ "\r\n" + "Server: cyclone/" +__version__+ "\r\n" "WebSocket-Origin: " + origin + "\r\n" "WebSocket-Location: ws://" + self.request.host + self.request.path + "\r\n\r\n") @@ -1106,7 +1106,7 @@ def _execute(self, transforms, *args, **kwargs): "HTTP/1.1 101 Web Socket Protocol Handshake\r\n" "Upgrade: WebSocket\r\n" "Connection: Upgrade\r\n" - "Server: CycloneServer/"+__version__+"\r\n" + "Server: cyclone/"+__version__+"\r\n" "WebSocket-Origin: " + self.request.headers["Origin"] + "\r\n" "WebSocket-Location: ws://" + self.request.host + self.request.path + "\r\n\r\n") diff --git a/setup.py b/setup.py index c3a34ff4c2..a4b0ae5b7b 100644 --- a/setup.py +++ b/setup.py @@ -19,14 +19,14 @@ setuptools.setup( name="cyclone", - version="0.6-rc2", + version="0.7", packages=["cyclone", "cyclone.tw", "cyclone.redis"], #install_requires=["twisted"], author="fiorix", author_email="fiorix@gmail.com", - url="http://github.com/fiorix/cyclone/", + url="http://cyclone.io/", license="http://www.apache.org/licenses/LICENSE-2.0", - description="Non-blocking web server. A facebook's tornado implementation on top of Twisted.", + description="Non-blocking web server. A facebook's Tornado on top of Twisted.", keywords="web server non-blocking python twisted facebook tornado", package_data={"cyclone":["appskel.zip"]}, )