Fixes for htmlfile, multipart, polling

Removed patches
Removed server events

lib/socket.io/listener.js

@@ -11,7 +11,7 @@ Listener = this.Listener = Class({
 	options: {
 		origins: '*:*',
 		resource: 'socket.io',
-		transports: ['websocket', 'server-events', 'flashsocket', 'htmlfile', 'xhr-multipart', 'xhr-polling'],
+		transports: ['websocket', 'flashsocket', 'htmlfile', 'xhr-multipart', 'xhr-polling'],
 		timeout: 8000,
 		log: function(message){
 			sys.log(message);

lib/socket.io/transports/htmlfile.js

@@ -7,17 +7,10 @@ this['htmlfile'] = Client.extend({
 		switch (req.method){
 			case 'GET':
 				var self = this;
-				this.__super__(req, res);							
-				this.request.addListener('end', function(){
-					if (!('hijack' in self.connection)){
-						throw new Error('You have to patch Node! Please refer to the README');
-					}
-
-					self.connection.addListener('end', function(){ self._onClose(); });								
-					self.connection.hijack();
-					self.connection.setTimeout(0);
-				});
-
+				this.__super__(req, res);
+
+				this.response.useChunkedEncodingByDefault = false;
+				this.response.shouldKeepAlive = true;
 				this.response.writeHead(200, { 'Content-type': 'text/html' });
 				this.response.flush();
 
@@ -26,8 +19,11 @@ this['htmlfile'] = Client.extend({
 
 			case 'POST':
 				req.addListener('data', function(message){
+					body += message;
+				});
+				req.addListener('end', function(){
 					try {
-						var msg = qs.parse(message);
+						var msg = qs.parse(body);
 						self._onMessage(msg.data);
 					} catch(e){}			
 					res.writeHead(200);

lib/socket.io/transports/xhr-multipart.js

@@ -4,22 +4,14 @@ var Client = require('../client').Client,
 this['xhr-multipart'] = Client.extend({
 
 	_onConnect: function(req, res){
-		var self = this;
+		var self = this, body = '';
 		switch (req.method){
 			case 'GET':
 				var self = this;		
 				this.__super__(req, res);
-				this.request.addListener('end', function(){
-					if (!('hijack' in self.connection)){
-						throw new Error('You have to patch Node! Please refer to the README');
-					}
 
-					self.connection.addListener('end', function(){ self._onClose(); });				
-					self.connection.hijack();
-					self.connection.setTimeout(0);
-				});
-
-				this.response.use_chunked_encoding_by_default = false;
+				this.response.useChunkedEncodingByDefault = false;
+				this.response.shouldKeepAlive = true;
 				this.response.writeHead(200, {
 					'Content-Type': 'multipart/x-mixed-replace;boundary=socketio',
 					'Connection': 'keep-alive'
@@ -32,8 +24,11 @@ this['xhr-multipart'] = Client.extend({
 
 			case 'POST':
 				req.addListener('data', function(message){
+					body += message;
+				});
+				req.addListener('end', function(){
 					try {
-						var msg = qs.parse(message);
+						var msg = qs.parse(body);
 						self._onMessage(msg.data);
 					} catch(e){}			
 					res.writeHead(200);

lib/socket.io/transports/xhr-polling.js

@@ -21,8 +21,11 @@ this['xhr-polling'] = Client.extend({
 
 			case 'POST':
 				req.addListener('data', function(message){
+					body += message;
+				});
+				req.addListener('end', function(){
 					try {
-						var msg = qs.parse(message);
+						var msg = qs.parse(body);
 						self._onMessage(msg.data);
 					} catch(e){}			
 					res.writeHead(200);