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: socketio/socket.io
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e2ebd4349bf27c3839fc9a2700b42cf8390ac3bd
Choose a base ref
...
head repository: socketio/socket.io
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: db831a3de4528a2017dad5e9b419333d4d929bd3
Choose a head ref
Loading
Showing with 5,318 additions and 1,097 deletions.
  1. +26 −0 .github/ISSUE_TEMPLATE.md
  2. +18 −0 .github/PULL_REQUEST_TEMPLATE.md
  3. +3 −0 .gitignore
  4. +0 −4 .npmignore
  5. +10 −12 .travis.yml
  6. +0 −502 History.md
  7. +1 −1 LICENSE
  8. +0 −15 Makefile
  9. +178 −309 Readme.md
  10. +880 −0 docs/API.md
  11. +15 −0 docs/README.md
  12. +64 −0 docs/emit.md
  13. +1 −1 examples/chat/README.md
  14. +4 −7 examples/chat/index.js
  15. +5 −2 examples/chat/package.json
  16. +18 −2 examples/chat/public/main.js
  17. +0 −1 examples/chat/public/style.css
  18. +31 −0 examples/cluster-haproxy/README.md
  19. +51 −0 examples/cluster-haproxy/docker-compose.yml
  20. +2 −0 examples/cluster-haproxy/haproxy/Dockerfile
  21. +31 −0 examples/cluster-haproxy/haproxy/haproxy.cfg
  22. +15 −0 examples/cluster-haproxy/server/Dockerfile
  23. +87 −0 examples/cluster-haproxy/server/index.js
  24. +17 −0 examples/cluster-haproxy/server/package.json
  25. +28 −0 examples/cluster-haproxy/server/public/index.html
  26. +286 −0 examples/cluster-haproxy/server/public/main.js
  27. +149 −0 examples/cluster-haproxy/server/public/style.css
  28. +31 −0 examples/cluster-httpd/README.md
  29. +51 −0 examples/cluster-httpd/docker-compose.yml
  30. +2 −0 examples/cluster-httpd/httpd/Dockerfile
  31. +52 −0 examples/cluster-httpd/httpd/httpd.conf
  32. +15 −0 examples/cluster-httpd/server/Dockerfile
  33. +82 −0 examples/cluster-httpd/server/index.js
  34. +17 −0 examples/cluster-httpd/server/package.json
  35. +28 −0 examples/cluster-httpd/server/public/index.html
  36. +286 −0 examples/cluster-httpd/server/public/main.js
  37. +149 −0 examples/cluster-httpd/server/public/style.css
  38. +31 −0 examples/cluster-nginx/README.md
  39. +51 −0 examples/cluster-nginx/docker-compose.yml
  40. +3 −0 examples/cluster-nginx/nginx/Dockerfile
  41. +35 −0 examples/cluster-nginx/nginx/nginx.conf
  42. +15 −0 examples/cluster-nginx/server/Dockerfile
  43. +82 −0 examples/cluster-nginx/server/index.js
  44. +17 −0 examples/cluster-nginx/server/package.json
  45. +28 −0 examples/cluster-nginx/server/public/index.html
  46. +286 −0 examples/cluster-nginx/server/public/main.js
  47. +149 −0 examples/cluster-nginx/server/public/style.css
  48. +50 −0 examples/custom-parsers/README.md
  49. +21 −0 examples/custom-parsers/package.json
  50. +13 −0 examples/custom-parsers/public/index.html
  51. +8 −0 examples/custom-parsers/src/client1.js
  52. +11 −0 examples/custom-parsers/src/client2.js
  53. +11 −0 examples/custom-parsers/src/client3.js
  54. +11 −0 examples/custom-parsers/src/client4.js
  55. +125 −0 examples/custom-parsers/src/custom-parser.js
  56. +55 −0 examples/custom-parsers/src/server.js
  57. +15 −0 examples/custom-parsers/support/webpack.config.js
  58. +18 −0 examples/webpack-build-server/README.md
  59. +16 −0 examples/webpack-build-server/lib/index.js
  60. +15 −0 examples/webpack-build-server/package.json
  61. +9 −0 examples/webpack-build-server/support/webpack.config.js
  62. +20 −0 examples/webpack-build/README.md
  63. +13 −0 examples/webpack-build/index.html
  64. +12 −0 examples/webpack-build/lib/index.js
  65. +21 −0 examples/webpack-build/package.json
  66. +2 −0 examples/webpack-build/support/noop.js
  67. +8 −0 examples/webpack-build/support/webpack.config.js
  68. +33 −0 examples/webpack-build/support/webpack.config.json-parser.js
  69. +31 −0 examples/webpack-build/support/webpack.config.slim.js
  70. +17 −0 examples/whiteboard/README.md
  71. +16 −0 examples/whiteboard/index.js
  72. +19 −0 examples/whiteboard/package.json
  73. +23 −0 examples/whiteboard/public/index.html
  74. +100 −0 examples/whiteboard/public/main.js
  75. +44 −0 examples/whiteboard/public/style.css
  76. +0 −2 index.js
  77. +66 −40 lib/client.js
  78. +186 −43 lib/index.js
  79. +87 −33 lib/namespace.js
  80. +39 −0 lib/parent-namespace.js
  81. +193 −71 lib/socket.js
  82. +18 −13 package.json
  83. +11 −0 test/fixtures/server-close.js
  84. +651 −39 test/socket.io.js
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

*Note*: for support questions, please use one of these channels: [stackoverflow](http://stackoverflow.com/questions/tagged/socket.io) or [slack](https://socketio.slack.com)

### You want to:

* [x] report a *bug*
* [ ] request a *feature*

### Current behaviour


### Steps to reproduce (if the current behaviour is a bug)

**Note**: the best way to get a quick answer is to provide a failing test case, by forking the following [fiddle](https://github.com/darrachequesne/socket.io-fiddle) for example.

### Expected behaviour


### Setup
- OS:
- browser:
- socket.io version:

### Other information (e.g. stacktraces, related issues, suggestions how to fix)


18 changes: 18 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@

### The kind of change this PR does introduce

* [x] a bug fix
* [ ] a new feature
* [ ] an update to the documentation
* [ ] a code change that improves performance
* [ ] other

### Current behaviour


### New behaviour


### Other information (e.g. related issues)


3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -9,3 +9,6 @@ lib-cov
benchmarks/*.png
node_modules
coverage
.idea
dist
.nyc_output
4 changes: 0 additions & 4 deletions .npmignore

This file was deleted.

22 changes: 10 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
language: node_js
sudo: false
node_js:
- "0.8"
- "0.10"
- "0.11"

git:
depth: 1

matrix:
fast_finish: true
allow_failures:
- node_js: "0.11"

- '4'
- '6'
- '8'
- node
notifications:
irc: "irc.freenode.org#socket.io"
git:
depth: 1
cache:
directories:
- node_modules
Loading