Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: webtorrent/bittorrent-tracker
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v9.4.0
Choose a base ref
...
head repository: webtorrent/bittorrent-tracker
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v9.5.0
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Feb 18, 2018

  1. build

    @feross
    feross committed Feb 18, 2018
    Copy the full SHA
    fc87c8c View commit details

Commits on Feb 21, 2018

  1. fix(package): update simple-peer to version 9.0.0

    @greenkeeper
    greenkeeper[bot] committed Feb 21, 2018
    Copy the full SHA
    144a225 View commit details

  2. Merge pull request #260 from webtorrent/greenkeeper/simple-peer-9.0.0 

    Update simple-peer to the latest version 🚀
    @feross
    feross authored Feb 21, 2018
    Copy the full SHA
    58a7c4b View commit details

  3. 9.5.0

    @feross
    feross committed Feb 21, 2018
    Copy the full SHA
    11fae2d View commit details
Showing with 7 additions and 7 deletions.
  1. +2 −2 examples/express-embed/server.js
  2. +2 −2 lib/server/parse-websocket.js
  3. +2 −2 package.json
  4. +1 −1 server.js
4 changes: 2 additions & 2 deletions examples/express-embed/server.js
View file
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ var whitelist = {

var server = new Server({
http: false, // we do our own
udp: false, // not interested
ws: false, // not interested
udp: false, // not interested
ws: false, // not interested
filter: function (params) {
// black/whitelist for disallowing/allowing specific clients [default=allow all]
// this example only allows the uTorrent client
4 changes: 2 additions & 2 deletions lib/server/parse-websocket.js
View file
Original file line number Diff line number Diff line change
@@ -56,8 +56,8 @@ function parseWebSocketRequest (socket, opts, params) {
// to reduce memory usage.
if (socket.upgradeReq) {
socket.ip = opts.trustProxy
? socket.upgradeReq.headers['x-forwarded-for'] || socket.upgradeReq.connection.remoteAddress
: socket.upgradeReq.connection.remoteAddress.replace(common.REMOVE_IPV4_MAPPED_IPV6_RE, '') // force ipv4
? socket.upgradeReq.headers['x-forwarded-for'] || socket.upgradeReq.connection.remoteAddress
: socket.upgradeReq.connection.remoteAddress.replace(common.REMOVE_IPV4_MAPPED_IPV6_RE, '') // force ipv4
socket.port = socket.upgradeReq.connection.remotePort
if (socket.port) {
socket.addr = (common.IPV6_RE.test(socket.ip) ? '[' + socket.ip + ']' : socket.ip) + ':' + socket.port
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bittorrent-tracker",
"description": "Simple, robust, BitTorrent tracker (client & server) implementation",
"version": "9.4.0",
"version": "9.5.0",
"author": {
"name": "WebTorrent, LLC",
"email": "feross@webtorrent.io",
@@ -36,7 +36,7 @@
"run-series": "^1.0.2",
"safe-buffer": "^5.0.0",
"simple-get": "^2.0.0",
"simple-peer": "^8.3.0",
"simple-peer": "^9.0.0",
"simple-websocket": "^7.0.1",
"string2compact": "^1.1.1",
"uniq": "^1.0.1",
2 changes: 1 addition & 1 deletion server.js
View file
Original file line number Diff line number Diff line change
@@ -403,7 +403,7 @@ Server.prototype.onHttpRequest = function (req, res, opts) {
}
if (self.destroyed) return res.end()

delete response.action // only needed for UDP encoding
delete response.action // only needed for UDP encoding
res.end(bencode.encode(response))

if (params.action === common.ACTIONS.ANNOUNCE) {