From 991363a28cd6215159929df083948984f6bcd9d5 Mon Sep 17 00:00:00 2001 From: Astro Date: Fri, 12 Dec 2014 02:55:40 +0100 Subject: [PATCH] Revert "server _onHttpRequest(): ensure non-empty params" This reverts commit 74d91390494becb06af12e1b353f21a81eb1bbfb. Conflicts: server.js feross commented on 74d9139 5 hours ago > Do we need to check for empty params here? > > _onRequest should return an error via callback because > params.action is missing. Won't that work? https://github.com/feross/bittorrent-tracker/commit/74d91390494becb06af12e1b353f21a81eb1bbfb#commitcomment-8937428 --- server.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/server.js b/server.js index af1dd49..5b31b93 100644 --- a/server.js +++ b/server.js @@ -127,27 +127,22 @@ Server.prototype.getSwarm = function (binaryInfoHash) { Server.prototype._onHttpRequest = function (req, res) { var self = this - var error + var params try { params = parseHttpRequest(req, { trustProxy: self._trustProxy }) } catch (err) { - error = err - } - - if (!error && !params) error = new Error('Empty HTTP parameters') - if (error) { - debug('sent error %s', error.message) + debug('sent error %s', err.message) res.end(bencode.encode({ - 'failure reason': error.message + 'failure reason': err.message })) // even though it's an error for the client, it's just a warning for the server. // don't crash the server because a client sent bad data :) - self.emit('warning', error) - + self.emit('warning', err) + return }