diff options
| author | isaacs <i@izs.me> | 2013-05-17 13:04:02 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-05-17 14:04:54 -0700 |
| commit | 61c9f78c639459f28eea3d1de203b92debd9f513 (patch) | |
| tree | 72e6860c814a59075d8d61c0e8fff458db7925e0 /lib/_stream_transform.js | |
| parent | 79988438078f58f828811ec87394700ccef42293 (diff) | |
| parent | f59ab10a6415e7dce7a6c3b6e734c213298ec205 (diff) | |
| download | node-new-61c9f78c639459f28eea3d1de203b92debd9f513.tar.gz | |
Merge remote-tracking branch 'ry/v0.10' into master
Conflicts:
AUTHORS
ChangeLog
deps/uv/ChangeLog
deps/uv/config-unix.mk
deps/uv/src/unix/stream.c
deps/uv/src/version.c
deps/uv/uv.gyp
src/node.cc
src/node_buffer.cc
src/node_crypto.cc
src/node_version.h
src/stream_wrap.cc
src/stream_wrap.h
Diffstat (limited to 'lib/_stream_transform.js')
| -rw-r--r-- | lib/_stream_transform.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/_stream_transform.js b/lib/_stream_transform.js index 958bfa1148..bcadc4f797 100644 --- a/lib/_stream_transform.js +++ b/lib/_stream_transform.js @@ -135,9 +135,9 @@ function Transform(options) { }); } -Transform.prototype.push = function(chunk) { +Transform.prototype.push = function(chunk, encoding) { this._transformState.needTransform = false; - return Duplex.prototype.push.call(this, chunk); + return Duplex.prototype.push.call(this, chunk, encoding); }; // This is the part where you do stuff! |