summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge commit 'c3acdc2e38f871e28ffda1847b4338c4b02296b8'Peter Åstrand (astrand)2013-11-282-4/+99
| |\ | |/ |/|
* | Merge pull request #93 from dosaboy/topic/set-keepalive-optionsJoel Martin2013-10-292-4/+100
|\ \
| * | Adds optional TCP_KEEPALIVE to WebSocketServerEdward Hope-Morley2013-10-162-5/+101
| | * Merge commit '13c99bcf053f7f3af8ba84c0d963a9591e020f49'Peter Åstrand (astrand)2013-11-283-7/+6
| | |\ | |_|/ |/| |
* | | Fix search path construction in tests.Joel Martin2013-10-293-7/+6
| | * Merge commit 'b4e0b534d5d04d57265045b4baf49dd81555064b'Peter Åstrand (astrand)2013-11-280-0/+0
| | |\ | |_|/ |/| |
* | | Merge pull request #104 from stevschmid/patch-1Samuel2013-10-241-1/+1
|\ \ \
| * | | Fix crash when an import is missingSteven Schmid2013-10-241-1/+1
|/ / /
| | * Merge commit '32b0567343aee7753b2b6be1bc1ee9a69657ba26'Peter Åstrand (astrand)2013-11-281-2/+2
| | |\ | |_|/ |/| |
* | | Merge pull request #103 from dellsystem/masterSolly2013-10-211-2/+2
|\ \ \
| * | | Fix syntax errors in other/websockify.rbdellsystem2013-10-211-2/+2
|/ / /
| | * Merge commit '0e5c3ecfda3b1506b41412052db75d84df2b4ae7'Peter Åstrand (astrand)2013-11-281-1/+10
| | |\ | |_|/ |/| |
* | | Merge pull request #102 from DirectXMan12/masterSolly2013-10-211-1/+10
|\ \ \ | |/ / |/| |
| * | Handle SIGCHLD properly for multiprocessingSolly Ross2013-10-211-1/+10
|/ /
| * Merge commit 'a61ae52610642ae58e914dda705df8bb9c8213ec'Peter Åstrand (astrand)2013-11-282-25/+69
| |\ | |/ |/|
* | Merge pull request #86 from chrislee35/masterJoel Martin2013-10-152-25/+69
|\ \
| * | fixed 1.8 compatibility bug for OpenSSL::SSL::SSLSocket#read_nonblock vs #rea...chrislee352013-07-021-0/+10
| * | adding SSL support and Ruby1.9 supportchrislee352013-07-022-25/+59
| | * Merge commit '477dce6cf86d61b20a394f3cbf3170e60d199658'Peter Åstrand (astrand)2013-11-282-54/+98
| | |\ | |_|/ |/| |
* | | Merge pull request #100 from alonbl/logJoel Martin2013-10-152-54/+92
|\ \ \
| * | | websocket: use python logging moduleAlon Bar-Lev2013-10-152-53/+91
| * | | websocket: fix exception statement introduced by comment 903e3f06ee557Alon Bar-Lev2013-10-151-1/+1
|/ / /
| | * Merge commit '4459824cc8196ad78fe9258b6c560ad46fe4cd52'Peter Åstrand (astrand)2013-11-271-99/+121
| | |\ | |_|/ |/| |
* | | Merge pull request #98 from alonbl/apicleanupJoel Martin2013-10-141-100/+120
|\ \ \
| * | | websocket: do not exit at the middle of processAlon Bar-Lev2013-10-141-9/+15
| * | | websocket: restore signals after processingAlon Bar-Lev2013-10-141-95/+105
| * | | websocket: support SIGTERM as exit signalAlon Bar-Lev2013-10-141-3/+7
| | | * Merge commit 'a7fa97f0e14926cc4433483fcb7581e0b3782140'Peter Åstrand (astrand)2013-11-271-3/+4
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #99 from alonbl/targetconfigJoel Martin2013-10-141-3/+4
|\ \ \ \ | |/ / / |/| | |
| * | | WebSocketProxy: support non path target_cfgAlon Bar-Lev2013-10-141-3/+4
|/ / /
| | * Merge commit 'edde5cd0ff6059bddae10c9b9faf0b3e8f388a9e'Peter Åstrand (astrand)2013-11-271-1/+1
| | |\ | |_|/ |/| |
* | | Merge pull request #91 from MartinF/masterSamuel2013-10-091-1/+1
|\ \ \
| * | | Fixed wiki referenceMartin From2013-09-091-1/+1
| | | * Merge commit 'bff3c373b32ebf707085e3c677bfad19b44fa054'Peter Åstrand (astrand)2013-11-271-3/+1
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #96 from DirectXMan12/masterJoel Martin2013-09-271-3/+1
|\ \ \ \
| * | | | Enable Process Reaping in All Conditionsdirectxman122013-09-201-3/+1
| |/ / /
| | | * Merge commit 'f30ad05c70ab2a43c9078e2f79da40f1dc0c60ec'Peter Åstrand (astrand)2013-11-271-1/+4
| | | |\ | |_|_|/ |/| | |
* | | | Fix #97: rebind.so not found when installedJoel Martin2013-09-271-1/+4
|/ / /
| | * Merge commit 'ab389d4e7114d7ddbfd085591d336ea5cc06c00d'Peter Åstrand (astrand)2013-11-271-1/+2
| | |\ | |_|/ |/| |
* | | Merge pull request #85 from dillaman/masterJoel Martin2013-07-021-1/+2
|\ \ \ | |/ / |/| |
| * | Collect zombie child processes within server loopJason Dillaman2013-06-281-1/+2
|/ /
| * Merge commit '264f8fdd7f12bd5b9f6813fb8de81c55b6328d9b'Peter Åstrand (astrand)2013-11-274-3/+16
| |\ | |/ |/|
* | Update to version 0.5.1v0.5.1Joel Martin2013-06-274-3/+16
| * Merge commit '36cb8f4676c7b5ff34bd22ad729e00e77efb6f00'Peter Åstrand (astrand)2013-11-273-1/+10
| |\ | |/ |/|
* | Move javascript websockify files to other/jsJoel Martin2013-06-273-1/+10
| * Merge commit '36fcd5784fa0825eedbf31d91bc42c970605ddb4'Peter Åstrand (astrand)2013-11-271-0/+22
| |\ | |/ |/|
* | Add package file for websockify.jsJoel Martin2013-06-271-0/+22
| * Merge commit '46450577c2fb119fc5bf0ac09664f22651a080d0'Peter Åstrand (astrand)2013-11-271-12/+9
| |\ | |/ |/|
* | Use upstream einaros/ws 0.4.27 with sub-protocol support.Joel Martin2013-06-271-12/+9
| * Merge commit 'd3ba23fa64d79eeb602ff1015ec31014fd8e9b35'Peter Åstrand (astrand)2013-11-272-0/+0
| |\ | |/ |/|