Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge commit 'c3acdc2e38f871e28ffda1847b4338c4b02296b8' | Peter Åstrand (astrand) | 2013-11-28 | 2 | -4/+99 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #93 from dosaboy/topic/set-keepalive-options | Joel Martin | 2013-10-29 | 2 | -4/+100 | |
|\ \ | ||||||
| * | | Adds optional TCP_KEEPALIVE to WebSocketServer | Edward Hope-Morley | 2013-10-16 | 2 | -5/+101 | |
| | * | Merge commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49' | Peter Åstrand (astrand) | 2013-11-28 | 3 | -7/+6 | |
| | |\ | |_|/ |/| | | ||||||
* | | | Fix search path construction in tests. | Joel Martin | 2013-10-29 | 3 | -7/+6 | |
| | * | Merge commit 'b4e0b534d5d04d57265045b4baf49dd81555064b' | Peter Åstrand (astrand) | 2013-11-28 | 0 | -0/+0 | |
| | |\ | |_|/ |/| | | ||||||
* | | | Merge pull request #104 from stevschmid/patch-1 | Samuel | 2013-10-24 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Fix crash when an import is missing | Steven Schmid | 2013-10-24 | 1 | -1/+1 | |
|/ / / | ||||||
| | * | Merge commit '32b0567343aee7753b2b6be1bc1ee9a69657ba26' | Peter Åstrand (astrand) | 2013-11-28 | 1 | -2/+2 | |
| | |\ | |_|/ |/| | | ||||||
* | | | Merge pull request #103 from dellsystem/master | Solly | 2013-10-21 | 1 | -2/+2 | |
|\ \ \ | ||||||
| * | | | Fix syntax errors in other/websockify.rb | dellsystem | 2013-10-21 | 1 | -2/+2 | |
|/ / / | ||||||
| | * | Merge commit '0e5c3ecfda3b1506b41412052db75d84df2b4ae7' | Peter Åstrand (astrand) | 2013-11-28 | 1 | -1/+10 | |
| | |\ | |_|/ |/| | | ||||||
* | | | Merge pull request #102 from DirectXMan12/master | Solly | 2013-10-21 | 1 | -1/+10 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Handle SIGCHLD properly for multiprocessing | Solly Ross | 2013-10-21 | 1 | -1/+10 | |
|/ / | ||||||
| * | Merge commit 'a61ae52610642ae58e914dda705df8bb9c8213ec' | Peter Åstrand (astrand) | 2013-11-28 | 2 | -25/+69 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #86 from chrislee35/master | Joel Martin | 2013-10-15 | 2 | -25/+69 | |
|\ \ | ||||||
| * | | fixed 1.8 compatibility bug for OpenSSL::SSL::SSLSocket#read_nonblock vs #rea... | chrislee35 | 2013-07-02 | 1 | -0/+10 | |
| * | | adding SSL support and Ruby1.9 support | chrislee35 | 2013-07-02 | 2 | -25/+59 | |
| | * | Merge commit '477dce6cf86d61b20a394f3cbf3170e60d199658' | Peter Åstrand (astrand) | 2013-11-28 | 2 | -54/+98 | |
| | |\ | |_|/ |/| | | ||||||
* | | | Merge pull request #100 from alonbl/log | Joel Martin | 2013-10-15 | 2 | -54/+92 | |
|\ \ \ | ||||||
| * | | | websocket: use python logging module | Alon Bar-Lev | 2013-10-15 | 2 | -53/+91 | |
| * | | | websocket: fix exception statement introduced by comment 903e3f06ee557 | Alon Bar-Lev | 2013-10-15 | 1 | -1/+1 | |
|/ / / | ||||||
| | * | Merge commit '4459824cc8196ad78fe9258b6c560ad46fe4cd52' | Peter Åstrand (astrand) | 2013-11-27 | 1 | -99/+121 | |
| | |\ | |_|/ |/| | | ||||||
* | | | Merge pull request #98 from alonbl/apicleanup | Joel Martin | 2013-10-14 | 1 | -100/+120 | |
|\ \ \ | ||||||
| * | | | websocket: do not exit at the middle of process | Alon Bar-Lev | 2013-10-14 | 1 | -9/+15 | |
| * | | | websocket: restore signals after processing | Alon Bar-Lev | 2013-10-14 | 1 | -95/+105 | |
| * | | | websocket: support SIGTERM as exit signal | Alon Bar-Lev | 2013-10-14 | 1 | -3/+7 | |
| | | * | Merge commit 'a7fa97f0e14926cc4433483fcb7581e0b3782140' | Peter Åstrand (astrand) | 2013-11-27 | 1 | -3/+4 | |
| | | |\ | |_|_|/ |/| | | | ||||||
* | | | | Merge pull request #99 from alonbl/targetconfig | Joel Martin | 2013-10-14 | 1 | -3/+4 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | WebSocketProxy: support non path target_cfg | Alon Bar-Lev | 2013-10-14 | 1 | -3/+4 | |
|/ / / | ||||||
| | * | Merge commit 'edde5cd0ff6059bddae10c9b9faf0b3e8f388a9e' | Peter Åstrand (astrand) | 2013-11-27 | 1 | -1/+1 | |
| | |\ | |_|/ |/| | | ||||||
* | | | Merge pull request #91 from MartinF/master | Samuel | 2013-10-09 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Fixed wiki reference | Martin From | 2013-09-09 | 1 | -1/+1 | |
| | | * | Merge commit 'bff3c373b32ebf707085e3c677bfad19b44fa054' | Peter Åstrand (astrand) | 2013-11-27 | 1 | -3/+1 | |
| | | |\ | |_|_|/ |/| | | | ||||||
* | | | | Merge pull request #96 from DirectXMan12/master | Joel Martin | 2013-09-27 | 1 | -3/+1 | |
|\ \ \ \ | ||||||
| * | | | | Enable Process Reaping in All Conditions | directxman12 | 2013-09-20 | 1 | -3/+1 | |
| |/ / / | ||||||
| | | * | Merge commit 'f30ad05c70ab2a43c9078e2f79da40f1dc0c60ec' | Peter Åstrand (astrand) | 2013-11-27 | 1 | -1/+4 | |
| | | |\ | |_|_|/ |/| | | | ||||||
* | | | | Fix #97: rebind.so not found when installed | Joel Martin | 2013-09-27 | 1 | -1/+4 | |
|/ / / | ||||||
| | * | Merge commit 'ab389d4e7114d7ddbfd085591d336ea5cc06c00d' | Peter Åstrand (astrand) | 2013-11-27 | 1 | -1/+2 | |
| | |\ | |_|/ |/| | | ||||||
* | | | Merge pull request #85 from dillaman/master | Joel Martin | 2013-07-02 | 1 | -1/+2 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Collect zombie child processes within server loop | Jason Dillaman | 2013-06-28 | 1 | -1/+2 | |
|/ / | ||||||
| * | Merge commit '264f8fdd7f12bd5b9f6813fb8de81c55b6328d9b' | Peter Åstrand (astrand) | 2013-11-27 | 4 | -3/+16 | |
| |\ | |/ |/| | ||||||
* | | Update to version 0.5.1v0.5.1 | Joel Martin | 2013-06-27 | 4 | -3/+16 | |
| * | Merge commit '36cb8f4676c7b5ff34bd22ad729e00e77efb6f00' | Peter Åstrand (astrand) | 2013-11-27 | 3 | -1/+10 | |
| |\ | |/ |/| | ||||||
* | | Move javascript websockify files to other/js | Joel Martin | 2013-06-27 | 3 | -1/+10 | |
| * | Merge commit '36fcd5784fa0825eedbf31d91bc42c970605ddb4' | Peter Åstrand (astrand) | 2013-11-27 | 1 | -0/+22 | |
| |\ | |/ |/| | ||||||
* | | Add package file for websockify.js | Joel Martin | 2013-06-27 | 1 | -0/+22 | |
| * | Merge commit '46450577c2fb119fc5bf0ac09664f22651a080d0' | Peter Åstrand (astrand) | 2013-11-27 | 1 | -12/+9 | |
| |\ | |/ |/| | ||||||
* | | Use upstream einaros/ws 0.4.27 with sub-protocol support. | Joel Martin | 2013-06-27 | 1 | -12/+9 | |
| * | Merge commit 'd3ba23fa64d79eeb602ff1015ec31014fd8e9b35' | Peter Åstrand (astrand) | 2013-11-27 | 2 | -0/+0 | |
| |\ | |/ |/| |