summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Change submodule's url to point to the trove using upstream: aliasbaserock/v0.6.1-1-g2f02574Pedro Alvarez2015-05-141-1/+1
* Update to 0.6.1v0.6.1patchesSolly Ross2015-05-113-2/+7
* Restore functionaltiy to file_onlySolly Ross2015-05-111-2/+6
* Update to v0.6.0v0.6.0Solly Ross2014-02-183-2/+11
* README: update with general contact info.Joel Martin2014-02-031-0/+22
* Fix default log level in echo and load testsSolly Ross2014-01-302-2/+6
* README: fix wrap mode examples.Joel Martin2014-01-131-5/+6
* Merge pull request #111 from astrand/masterastrand2013-12-194-208/+317
|\
| * Merge remote branch 'upstream/master'Peter Åstrand (astrand)2013-12-190-0/+0
| |\ | |/ |/|
* | Prepare for fixing https://github.com/kanaka/websockify/pull/111Peter Åstrand (astrand)2013-12-191-110/+110
| * Minor whitespace and layout tweaks, to reduce diff againstPeter Åstrand (astrand)2013-12-172-4/+5
| * Merge remote branch 'upstream/master'Peter Åstrand (astrand)2013-12-170-0/+0
| |\ | |/ |/|
* | Cherry-picked 4e3388964af9697496d2c5e000bb8559dfba87ad fromPeter Åstrand (astrand)2013-12-171-217/+217
| * Merge remote branch 'upstream/master', after #110 was merged.Peter Åstrand (astrand)2013-12-165-5/+5
| |\ | |/ |/|
* | Merge pull request #110 from astrand/rename-self-clientastrand2013-12-168-29/+29
|\ \
| * | Rename new_client to new_websocket_client, in order to have a betterPeter Åstrand (astrand)2013-11-288-12/+12
| * | Rename self.client to self.request, in preparation for merging pullPeter Åstrand (astrand)2013-11-284-17/+17
|/ /
| * Follow up on 131f9ea645ac6f00d98743a420d168033f99063a: Proper loggingPeter Åstrand (astrand)2013-11-281-3/+7
| * Merge commit '34a1b68d79a13c03aa63b5c4194796341c9383fe'Peter Åstrand (astrand)2013-11-281-4/+3
| |\ | |/ |/|
* | Clarify ssl module build for old python versions.Joel Martin2013-11-201-4/+3
| * Merge commit 'a04edfe80f54b44df5a3579f71710560c6b7b4fc'Peter Åstrand (astrand)2013-11-284-107/+90
| |\ | |/ |/|
* | Merge pull request #105 from dosaboy/topic/unit-test-cleanupJoel Martin2013-11-204-107/+90
|\ \
| * | Added temp dir for unit test data and cleanupEdward Hope-Morley2013-11-144-107/+90
|/ /
| * Merge commit 'a47be21f9fa69ddf8d888ff9e3c75cdfc9e31c00'Peter Åstrand (astrand)2013-11-284-18/+358
| |\ | |/ |/|
* | Merge pull request #94 from dosaboy/topic/add-unit-testsJoel Martin2013-10-294-18/+358
|\ \
| * | Added unit tests for websocket and websocketproxyEdward Hope-Morley2013-10-294-18/+358
|/ /
| * 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
|\ \ \