added encode=UTF-8 in jsonp-polling.js and xhr-polling.js since UTF-8…

… is the default encoding for http.ServerResponse.write replaced string.length with Buffer.byteLength in jsonp-polling.js, listener.js and xhr-polling.js because content-length header requires number of bytes and not the number of symbols in string
socketio · Sep 28, 2010 · d2ead47 · jmoyers · Sep 29, 2010 · SlNPacifist
1 parent c1e0831
commit d2ead47
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/socket.io/listener.js b/lib/socket.io/listener.js
@@ -135,7 +135,7 @@ Listener.prototype._serveClient = function(path, req, res){
 				}
 				self._clientFiles[path] = {
 					headers: {
-						'Content-Length': data.length,
+						'Content-Length': Buffer.byteLength(data),
 						'Content-Type': types[ext],
 						'ETag': clientVersion
 					},

diff --git a/lib/socket.io/transports/jsonp-polling.js b/lib/socket.io/transports/jsonp-polling.js
@@ -18,7 +18,7 @@ JSONPPolling.prototype._write = function(message){
 	} else {
 		message = "io.JSONP["+ this._index +"]._("+ JSON.stringify(message) +");";
 	}
-	this.response.writeHead(200, {'Content-Type': 'text/javascript', 'Content-Length': message.length});
+	this.response.writeHead(200, {'Content-Type': 'text/javascript; charset=UTF-8', 'Content-Length': Buffer.byteLength(message)});
 	this.response.write(message);
 	this.response.end();
 	this._onClose();

diff --git a/lib/socket.io/transports/xhr-polling.js b/lib/socket.io/transports/xhr-polling.js
@@ -50,7 +50,7 @@ Polling.prototype._onConnect = function(req, res){
 
 Polling.prototype._write = function(message){
 	if (this._closeTimeout) clearTimeout(this._closeTimeout);
-	var headers = {'Content-Type': 'text/plain', 'Content-Length': message.length};
+	var headers = {'Content-Type': 'text/plain; charset=UTF-8', 'Content-Length': Buffer.byteLength(message)};
 	// https://developer.mozilla.org/En/HTTP_Access_Control
 	if (this.request.headers.origin && this._verifyOrigin(this.request.headers.origin)){
 		headers['Access-Control-Allow-Origin'] = this.request.headers.origin;