merged from develop_2.0

This commit is contained in:
Tony Tam
2015-02-01 02:27:43 -08:00
parent 1be0f9fa35
commit 038443fc22
87 changed files with 11991 additions and 14394 deletions

View File

@@ -1723,7 +1723,7 @@ var zlib = null;
try {
zlib = require('zlib');
} catch (e) {
console.warn("no zlib library");
// console.warn("no zlib library");
}
// Iconv doesn't work in browser
@@ -1731,7 +1731,7 @@ var Iconv = null;
try {
Iconv = require('iconv-lite');
} catch (e) {
console.warn("no iconv library");
// console.warn("no iconv library");
}
// Construct a `Response` object. You should never have to do this directly. The
@@ -2207,7 +2207,7 @@ module.exports = {
constructor.prototype.getHeaders = function() { return getHeaders(this,arguments); };
constructor.prototype.setHeader = function(key,value) { return setHeader(this,key,value); };
constructor.prototype.setHeaders = function(hash) { return setHeaders(this,hash); };
},
}
};
});