Merge pull request totaljs#348 from deadman2000/v1.9.6

petersirka · petersirka · commit 8900952a12e6 · 2016-01-04T13:52:55.000+01:00
Fixed U.request UTF-8 bug
diff --git a/index.js b/index.js
@@ -283,6 +283,12 @@ global.NEWTRANSFORM = function(name, fn, isDefault) {
 	return TransformBuilder.addTransform.apply(this, arguments);
 };
 
+/**
+ * Creates schema in the specific group
+ * @param {String} [group=default]
+ * @param {String} name
+ * @return {SchemaBuilderEntity}
+ */
 global.NEWSCHEMA = function(group, name) {
 	if (!name) {
 		name = group;
diff --git a/utils.js b/utils.js
@@ -576,7 +576,7 @@ exports.request = function(url, flags, data, callback, cookies, headers, encodin
 
 	var onResponse = function(res) {
 
-		res._buffer = '';
+		res._buffer = null;
 		res._bufferlength = 0;
 
 		// We have redirect
@@ -588,16 +588,21 @@ exports.request = function(url, flags, data, callback, cookies, headers, encodin
 
 		res.on('data', function(chunk) {
 			var self = this;
-			self._buffer += chunk.toString(encoding);
+			if (self._buffer)
+				self._buffer = Buffer.concat([self._buffer, chunk]);
+			else
+				self._buffer = chunk;
 			self._bufferlength += chunk.length;
 			e.emit('data', chunk, responseLength ? (self._bufferlength / responseLength) * 100 : 0);
 		});
 
 		res.on('end', function() {
 			var self = this;
-			e.emit('end', self._buffer, self.statusCode, self.headers, uri.host);
+			var str = self._buffer.toString(encoding);
+			delete self._buffer; // Free memory
+			e.emit('end', str, self.statusCode, self.headers, uri.host);
 			if (callback)
-				callback(null, self._buffer, self.statusCode, self.headers, uri.host);
+				callback(null, str, self.statusCode, self.headers, uri.host);
 			callback = null;
 		});
 
