Skip to content

Commit

Permalink
updated version to 0.7 and http "Server" header to "cyclone"
Browse files Browse the repository at this point in the history
  • Loading branch information
fiorix committed Nov 17, 2011
1 parent f81b15b commit 94e6220
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cyclone/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# under the License.

__author__ = "Alexandre Fiori"
__version__ = "0.6-rc2"
__version__ = "0.7"
8 changes: 4 additions & 4 deletions cyclone/web.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand All @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]",
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"]},
)

0 comments on commit 94e6220

Please sign in to comment.