diff --git a/node_lib/phusion_passenger/httplib_emulation.js b/node_lib/phusion_passenger/httplib_emulation.js
index f0d86e1df7..aefd965926 100644
--- a/node_lib/phusion_passenger/httplib_emulation.js
+++ b/node_lib/phusion_passenger/httplib_emulation.js
@@ -125,6 +125,12 @@ function createServerResponse(req) {
 	var res = new http.ServerResponse(req);
 	res.assignSocket(req.socket);
 	res.shouldKeepAlive = false;
+	req.socket.on('drain', function() {
+		res.emit('drain');
+	});
+	req.socket.on('timeout', function() {
+		res.emit('timeout');
+	});
 	res.once('finish', function() {
 		req.socket.destroySoon();
 	});