Skip to content

Conversation

@chrisdickinson
Copy link
Contributor

Revert "src: fix windows build error" and "zlib: support
concatenated gzip files".

This reverts commits be413ac
and 1183ba4.

Conflicts:
test/parallel/test-zlib-from-multiple-gzip-with-garbage.js
test/parallel/test-zlib-from-multiple-gzip.js
test/parallel/test-zlib-from-multiple-huge-gzip.js

Fixes: npm errors here. Equivalent Node PR here. If there are no objections I'd like to re-add this behavior behind an option after this is reverted.

Revert "src: fix windows build error" and "zlib: support
concatenated gzip files".

This reverts commits be413ac
and 1183ba4.

Conflicts:
	test/parallel/test-zlib-from-multiple-gzip-with-garbage.js
	test/parallel/test-zlib-from-multiple-gzip.js
	test/parallel/test-zlib-from-multiple-huge-gzip.js
@bnoordhuis
Copy link
Member

LGTM but the commit log should explain why it reverts those commits.

chrisdickinson added a commit that referenced this pull request Jan 9, 2015
Revert "src: fix windows build error" and "zlib: support
concatenated gzip files".

This reverts commits be413ac
and 1183ba4.

Treating subsequent bytes as a concatenated zlib stream
breaks npm install.

Conflicts:
	test/parallel/test-zlib-from-multiple-gzip-with-garbage.js
	test/parallel/test-zlib-from-multiple-gzip.js
	test/parallel/test-zlib-from-multiple-huge-gzip.js

Fixes: nodejs/node-v0.x-archive#8962
PR-URL: #240
Reviewed-By: Ben Noordhuis <[email protected]>
@chrisdickinson
Copy link
Contributor Author

Merged in bc629c0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants