diff options
author | liris <liris.pp@gmail.com> | 2013-05-02 23:51:51 -0700 |
---|---|---|
committer | liris <liris.pp@gmail.com> | 2013-05-02 23:51:51 -0700 |
commit | 03d28cfae2061e8479fb59aba80d8e32cde26d4e (patch) | |
tree | 34b61b389be6f9a5792c2c2f3be2bd791e1bbf42 | |
parent | acb484191c9c819fb0979486a7bb39f7db89a695 (diff) | |
parent | a3429b70a587ec54e6ce920142b5a33b01a6012a (diff) | |
download | websocket-client-03d28cfae2061e8479fb59aba80d8e32cde26d4e.tar.gz |
Merge pull request #32 from methane/patch-1
Fix default Origin isn't URI
-rwxr-xr-x | bin/wsdump.py | 4 | ||||
-rw-r--r-- | websocket.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/wsdump.py b/bin/wsdump.py index 85c455d..0c9e1ae 100755 --- a/bin/wsdump.py +++ b/bin/wsdump.py @@ -57,9 +57,9 @@ class InteractiveConsole(code.InteractiveConsole): def main(): args = parse_args() console = InteractiveConsole() - ws = websocket.create_connection(args.url) if args.verbose > 1: websocket.enableTrace(True) + ws = websocket.create_connection(args.url) print("Press Ctrl+C to quit") def recv(): @@ -106,5 +106,5 @@ def main(): if __name__ == "__main__": try: main() - except Exception, e: + except Exception as e: print(e) diff --git a/websocket.py b/websocket.py index 0e18729..7781c0a 100644 --- a/websocket.py +++ b/websocket.py @@ -432,7 +432,7 @@ class WebSocket(object): if "origin" in options: headers.append("Origin: %s" % options["origin"]) else: - headers.append("Origin: %s" % hostport) + headers.append("Origin: http://%s" % hostport) key = _create_sec_websocket_key() headers.append("Sec-WebSocket-Key: %s" % key) |