Permalink
Browse files

[zlib] fixed inflating with dictionary, added test

  • Loading branch information...
1 parent e83b40a commit 047ea4f9774fa347bae9c25fefc55c2bc010718a @indutny committed Dec 3, 2011
Showing with 96 additions and 12 deletions.
  1. +23 −12 src/node_zlib.cc
  2. +73 −0 test/simple/test-zlib-dictionary.js
View
@@ -166,6 +166,22 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
case GUNZIP:
case INFLATERAW:
err = inflate(&(ctx->strm_), ctx->flush_);
+
+ // If data was encoded with dictionary
+ if (err == Z_NEED_DICT) {
+ assert(ctx->dictionary_ != NULL && "Stream has no dictionary");
+
+ // Load it
+ err = inflateSetDictionary(
+ &(ctx->strm_),
+ ctx->dictionary_,
+ ctx->dictionary_len_
+ );
+ assert(err == Z_OK && "Failed to set dictionary");
+
+ // And try to decode again
+ err = inflate(&(ctx->strm_), ctx->flush_);
+ }
break;
default:
assert(0 && "wtf?");
@@ -301,30 +317,24 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
assert(err == Z_OK);
- ctx->dictionary_ = dictionary;
+ ctx->dictionary_ = reinterpret_cast<Bytef *>(dictionary);
+ ctx->dictionary_len_ = dictionary_len;
+
if (dictionary != NULL) {
switch (mode) {
case DEFLATE:
case DEFLATERAW:
err = deflateSetDictionary(
&(ctx->strm_),
- reinterpret_cast<Bytef *>(dictionary),
- dictionary_len
- );
- break;
- case INFLATE:
- case INFLATERAW:
- err = inflateSetDictionary(
- &(ctx->strm_),
- reinterpret_cast<Bytef *>(dictionary),
+ ctx->dictionary_,
dictionary_len
);
break;
default:
break;
}
- assert(err == Z_OK);
+ assert(err == Z_OK && "Failed to set dictionary");
}
ctx->init_done_ = true;
@@ -340,7 +350,8 @@ template <node_zlib_mode mode> class ZCtx : public ObjectWrap {
int memLevel_;
int strategy_;
- char* dictionary_;
+ Bytef* dictionary_;
+ size_t dictionary_len_;
int flush_;
@@ -0,0 +1,73 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// 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.
+
+// test compression/decompresion with dictionary
+
+var common = require('../common.js');
+var assert = require('assert');
+var zlib = require('zlib');
+var path = require('path');
+
+var spdyDict = new Buffer([
+ 'optionsgetheadpostputdeletetraceacceptaccept-charsetaccept-encodingaccept-',
+ 'languageauthorizationexpectfromhostif-modified-sinceif-matchif-none-matchi',
+ 'f-rangeif-unmodifiedsincemax-forwardsproxy-authorizationrangerefererteuser',
+ '-agent10010120020120220320420520630030130230330430530630740040140240340440',
+ '5406407408409410411412413414415416417500501502503504505accept-rangesageeta',
+ 'glocationproxy-authenticatepublicretry-afterservervarywarningwww-authentic',
+ 'ateallowcontent-basecontent-encodingcache-controlconnectiondatetrailertran',
+ 'sfer-encodingupgradeviawarningcontent-languagecontent-lengthcontent-locati',
+ 'oncontent-md5content-rangecontent-typeetagexpireslast-modifiedset-cookieMo',
+ 'ndayTuesdayWednesdayThursdayFridaySaturdaySundayJanFebMarAprMayJunJulAugSe',
+ 'pOctNovDecchunkedtext/htmlimage/pngimage/jpgimage/gifapplication/xmlapplic',
+ 'ation/xhtmltext/plainpublicmax-agecharset=iso-8859-1utf-8gzipdeflateHTTP/1',
+ '.1statusversionurl\0'
+].join(''));
+
+var deflate = zlib.createDeflate({ dictionary: spdyDict });
+var inflate = zlib.createInflate({ dictionary: spdyDict });
+
+var input = [
+ 'HTTP/1.1 200 Ok',
+ 'Server: node.js',
+ 'Content-Length: 0',
+ ''
+].join('\r\n');
+
+// Put data into deflate stream
+deflate.on('data', function(chunk) {
+ inflate.write(chunk);
+});
+deflate.on('end', function() {
+ inflate.end();
+});
+
+// Get data from inflate stream
+var output = [];
+inflate.on('data', function(chunk) {
+ output.push(chunk);
+});
+inflate.on('end', function() {
+ assert.equal(output.join(''), input);
+});
+
+deflate.write(input);
+deflate.end();

0 comments on commit 047ea4f

Please sign in to comment.