Skip to content

[pull] master from webtorrent:master #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 8 commits into from
Mar 29, 2020
Merged

[pull] master from webtorrent:master #2

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
29d2e6b
Error.message is read only on some platforms.
koush Feb 3, 2020
e5df6fc
fix: error param
DiegoRBaquero Mar 29, 2020
fc4a0f7
Merge pull request #336 from koush/patch-1
DiegoRBaquero Mar 29, 2020
8b8daa3
fix: set correct headers
DiegoRBaquero Mar 29, 2020
587b6e6
fix standard
DiegoRBaquero Mar 29, 2020
51db46f
increase reconnect variance and maximum
DiegoRBaquero Mar 29, 2020
695b40a
authors
Mar 29, 2020
938db35
9.14.5
Mar 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: set correct headers
  • Loading branch information
@DiegoRBaquero
DiegoRBaquero authored Mar 29, 2020
commit 8b8daa3d4a3db60b1d80db8fc61b828cd85197e6
5 changes: 3 additions & 2 deletions server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,10 @@ class Server extends EventEmitter {
}

if (req.url === '/stats.json' || req.headers.accept === 'application/json') {
res.write(JSON.stringify(stats))
res.end()
res.setHeader('Content-Type', 'application/json')
res.end(JSON.stringify(stats))
} else if (req.url === '/stats') {
res.setHeader('Content-Type', 'text/html');
res.end(`
<h1>${stats.torrents} torrents (${stats.activeTorrents} active)</h1>
<h2>Connected Peers: ${stats.peersAll}</h2>
Expand Down