Clarify that we support HyBi 07-10.

HyBi 07 reports version 7 in the handshake.
HyBi 08-10 report version 8 in the handshake.

Remove version 9 since that is not yet actually defined.
This commit is contained in:
Joel Martin 2011-08-04 11:09:12 -05:00
parent 475cfae4e5
commit 7b496ce5bc
2 changed files with 7 additions and 5 deletions

View File

@ -132,19 +132,19 @@ implementations:
<td>no</td>
<td>yes</td>
</tr> <tr>
<th>Hixie 75</th>
<th>[Hixie 75](http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-75)</th>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td>no</td>
</tr> <tr>
<th>Hixie 76</th>
<th>[Hixie 76](http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76)</th>
<td>yes</td>
<td>yes</td>
<td>yes</td>
<td>yes</td>
</tr> <tr>
<th>IETF/HyBi 07</th>
<th>[IETF/HyBi 07-10](http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10)</th>
<td>yes</td>
<td>no</td>
<td>no</td>

View File

@ -8,7 +8,7 @@ Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
Supports following protocol versions:
- http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-75
- http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76
- http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07
- http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10
You can make a cert/key with openssl using:
openssl req -new -x509 -days 365 -nodes -out self.pem -keyout self.pem
@ -615,7 +615,9 @@ Sec-WebSocket-Accept: %s\r
if sys.hexversion < 0x2060000 or not numpy:
raise self.EClose("Python >= 2.6 and numpy module is required for HyBi-07 or greater")
if ver in ['7', '8', '9']:
# HyBi-07 report version 7
# HyBi-08 - HyBi-10 report version 8
if ver in ['7', '8']:
self.version = "hybi-0" + ver
else:
raise self.EClose('Unsupported protocol version %s' % ver)