[Pkg-javascript-commits] [node-ws] 02/06: Merge tag 'upstream/1.1.0+ds1.e6ddaae4'

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository node-ws.

commit 780c9e1a68114f68613fde25ff17e0c24cab45da
Merge: 685b8c0 fe0541a
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu May 12 20:34:42 2016 +0200

    Merge tag 'upstream/1.1.0+ds1.e6ddaae4'
    
    Upstream version 1.1.0+ds1.e6ddaae4
    
    # gpg: Signature made Thu 12 May 2016 20:34:42 CEST
    # gpg:                using RSA key 860DEF3B8F650B79
    # gpg: Good signature from "Ximin Luo <infinity0 at pwned.gg>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at torproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at freenetproject.org>" [ultimate]
    # gpg:                 aka "Ximin Luo <infinity0 at debian.org>" [ultimate]
    # gpg:                 aka "Satoshi Nakamoto (www.bitcoin.org) <satoshin at gmx.com>" [ultimate]

 .gitignore                   |   1 +
 Makefile                     |  19 +++---
 README.md                    |  17 ++---
 SECURITY.md                  |  33 ++++++++++
 doc/ws.md                    |   4 +-
 lib/BufferUtil.fallback.js   |   2 +-
 lib/PerMessageDeflate.js     |  16 ++++-
 lib/Receiver.hixie.js        |  12 +++-
 lib/Receiver.js              | 145 +++++++++++++++++++++++++++++++++++--------
 lib/Sender.js                |   2 +-
 lib/Validation.fallback.js   |   5 +-
 lib/WebSocket.js             |  48 ++++++++++----
 lib/WebSocketServer.js       |  91 +++++++++++++++++++--------
 package.json                 |   4 +-
 test/Receiver.test.js        | 102 ++++++++++++++++++++++++++++++
 test/WebSocket.test.js       | 103 +++++++++++++++++++++++++++++-
 test/WebSocketServer.test.js |  70 +++++++++++++++++++++
 17 files changed, 576 insertions(+), 98 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-ws.git