Skip to content

Commit

Permalink
WIP: Switch to Pako for zlib
Browse files Browse the repository at this point in the history
This commit introduces an alternate implementation of the zlib
decompressor based on Pako (https://github.com/nodeca/pako).
  • Loading branch information
DirectXMan12 committed Aug 6, 2015
1 parent 0442e15 commit 6940936
Show file tree
Hide file tree
Showing 12 changed files with 2,495 additions and 14 deletions.
4 changes: 4 additions & 0 deletions LICENSE.txt
Expand Up @@ -59,6 +59,9 @@ licenses (all MPL 2.0 compatible):

utils/websockify
utils/websocket.py : LGPL 3

utils/inflator.partial.js
include/inflator.js : MIT (for pako)

The following license texts are included:

Expand All @@ -70,6 +73,7 @@ The following license texts are included:
docs/LICENSE.BSD-2-Clause (Simplified BSD / FreeBSD)
docs/LICENSE.zlib
docs/LICENSE.Apache-2.0
docs/LICENSE.pako

Or alternatively the license texts may be found here:

Expand Down
3 changes: 1 addition & 2 deletions README.md
Expand Up @@ -133,6 +133,5 @@ use a WebSockets to TCP socket proxy. There is a python proxy included
* web-socket-js : Hiroshi Ichikawa (github.com/gimite/web-socket-js)
* as3crypto : Henri Torgemane (code.google.com/p/as3crypto)
* base64 : Martijn Pieters (Digital Creations 2), Samuel Sieb (sieb.net)
* jsunzip : Erik Moller (github.com/operasoftware/jsunzip),
* tinflate : Joergen Ibsen (ibsensoftware.com)
* DES : Dave Zimmerman (Widget Workshop), Jef Poskanzer (ACME Labs)
* Pako : Vitaly Puzrin (https://github.com/nodeca/pako)
21 changes: 21 additions & 0 deletions docs/LICENSE.pako
@@ -0,0 +1,21 @@
(The MIT License)

Copyright (C) 2014 by Vitaly Puzrin

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
6 changes: 6 additions & 0 deletions docs/notes
Expand Up @@ -15,3 +15,9 @@ Building web-socket-js emulator:

cd include/web-socket-js/flash-src
mxmlc -static-link-runtime-shared-libraries WebSocketMain.as

Rebuilding inflator.js

- Download pako from npm
- Install browserify using npm
- browserify utils/inflator.partial.js -o include/inflator.js

0 comments on commit 6940936

Please sign in to comment.