Replace ServerRequest/ClientResponse with IncomingMessage

Replace the http.ServerRequest and http.ClientResponse classes with the
IncomingMessage class, as is done in recent versions of node.  Add the
missing members to the prototype.

Signed-off-by: Kevin Locke <[email protected]>

Author: kevinoid

contrib/Ws.js

@@ -48,7 +48,7 @@ ws.Server = function(options, callback) {};
 ws.Server.prototype.close = function(code, data) {};
 
 /**
- * @param {http.ServerRequest} request
+ * @param {http.IncomingMessage} request
  * @param {net.Socket} socket
  * @param {string} upgradeHead
  * @param {function(...)} callback

http.js

@@ -30,7 +30,7 @@ END_NODE_INCLUDE
 var http = {};
 
 /**
- * @typedef {function(http.ServerRequest, http.ServerResponse)}
+ * @typedef {function(http.IncomingMessage, http.ServerResponse)}
  */
 http.requestListener;
 
@@ -60,63 +60,65 @@ http.Server.prototype.close = function() {};
 
 /**
  * @constructor
- * @extends events.EventEmitter
- * @private
+ * @extends stream.Readable
  */
-http.ServerRequest = function() {};
+http.IncomingMessage = function() {};
 
 /**
- * @type {string}
+ * @type {?string}
  * */
-http.ServerRequest.prototype.method;
+http.IncomingMessage.prototype.method;
 
 /**
- * @type {string}
+ * @type {?string}
  */
-http.ServerRequest.prototype.url;
+http.IncomingMessage.prototype.url;
 
 /**
  * @type {Object}
  * */
-http.ServerRequest.prototype.headers;
+http.IncomingMessage.prototype.headers;
 
 /**
  * @type {Object}
  * */
-http.ServerRequest.prototype.trailers;
+http.IncomingMessage.prototype.trailers;
 
 /**
  * @type {string}
  */
-http.ServerRequest.prototype.httpVersion;
+http.IncomingMessage.prototype.httpVersion;
 
 /**
  * @type {string}
  */
-http.ServerRequest.prototype.httpVersionMajor;
+http.IncomingMessage.prototype.httpVersionMajor;
 
 /**
  * @type {string}
  */
-http.ServerRequest.prototype.httpVersionMinor;
+http.IncomingMessage.prototype.httpVersionMinor;
 
 /**
- * @param {?string} encoding
+ * @type {*}
  */
-http.ServerRequest.prototype.setEncoding = function(encoding) {};
+http.IncomingMessage.prototype.connection;
 
 /**
+ * @type {?number}
  */
-http.ServerRequest.prototype.pause = function() {};
+http.IncomingMessage.prototype.statusCode;
 
 /**
+ * @type {net.Socket}
  */
-http.ServerRequest.prototype.resume = function() {};
+http.IncomingMessage.prototype.socket;
 
 /**
- * @type {*}
+ * @param {number} msecs
+ * @param {function()} callback
  */
-http.ServerRequest.prototype.connection;
+http.IncomingMessage.prototype.setTimeout = function(msecs, callback) {};
 
 /**
  * @constructor
@@ -198,66 +200,16 @@ http.ClientRequest.prototype.end = function(data, encoding) {};
  */
 http.ClientRequest.prototype.abort = function() {};
 
-/**
- * @constructor
- * @extends events.EventEmitter
- * @private
- */
-http.ClientResponse = function() {};
-
-/**
- * @type {number}
- */
-http.ClientResponse.prototype.statusCode;
-
-/**
- * @type {string}
- */
-http.ClientResponse.prototype.httpVersion;
-
-/**
- * @type {string}
- */
-http.ClientResponse.prototype.httpVersionMajor;
-
-/**
- * @type {string}
- */
-http.ClientResponse.prototype.httpVersionMinor;
-
-/**
- * @type {Object}
- * */
-http.ClientResponse.prototype.headers;
-
-/**
- * @type {Object}
- * */
-http.ClientResponse.prototype.trailers;
-
-/**
- * @param {?string} encoding
- */
-http.ClientResponse.prototype.setEncoding = function(encoding) {};
-
-/**
- */
-http.ClientResponse.prototype.pause = function() {};
-
-/**
- */
-http.ClientResponse.prototype.resume = function() {};
-
 /**
  * @param {Object} options
- * @param {function(http.ClientResponse)} callback
+ * @param {function(http.IncomingMessage)} callback
  * @return {http.ClientRequest}
  */
 http.request = function(options, callback) {};
 
 /**
  * @param {Object} options
- * @param {function(http.ClientResponse)} callback
+ * @param {function(http.IncomingMessage)} callback
  * @return {http.ClientRequest}
  */
 http.get = function(options, callback) {};

https.js

@@ -47,7 +47,7 @@ https.Server.prototype.close = function(callback) {};
 
 /**
  * @param {tls.CreateOptions} options
- * @param {function(https.Request, https.Response)=} requestListener
+ * @param {function(http.IncomingMessage, http.ServerResponse)=} requestListener
  */
 https.createServer = function(options, requestListener) {};
 
@@ -58,14 +58,14 @@ https.ConnectOptions;
 
 /**
  * @param {https.ConnectOptions|string} options
- * @param {function(http.ClientResponse)} callback
+ * @param {function(http.IncomingMessage)} callback
  * @return {http.ClientRequest}
  */
 https.request = function(options, callback) {};
 
 /**
  * @param {https.ConnectOptions|string} options
- * @param {function(http.ClientResponse)} callback
+ * @param {function(http.IncomingMessage)} callback
  * @return {http.ClientRequest}
  */
 https.get = function(options, callback) {};