summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Make sure the port is a simple stringPierre Ossman2019-07-031-2/+4
* Use safer method to get base directoryPierre Ossman2019-06-241-1/+1
* Remove information on building Python SSL modulePierre Ossman2019-06-241-22/+0
* Merge branch 'patch-1' of https://github.com/Hyask/websockifyPierre Ossman2019-06-172-4/+9
|\
| * run: invoke websockify through 'python -m'Skia2019-06-171-4/+5
| * Add a __main__.py file for invocation as a moduleSkia2019-06-131-0/+4
* | Use Ubuntu Trusty (14.04) for TravisPierre Ossman2019-06-131-0/+3
|/
* Make TokenRedis optionalPierre Ossman2019-05-241-17/+18
* [websocketproxy] Fixed base class call to process_request() when usingGiuseppe Corbelli2019-05-151-1/+1
* Merge branch 'master' of https://github.com/PexMor/websockifyPierre Ossman2019-05-093-1/+23
|\
| * novnc redis backed token_plyugins.pyPexMor2019-04-293-1/+23
* | Use client IP in logs, not hostPierre Ossman2019-04-251-1/+1
|/
* Re-enable Windows supportPierre Ossman2019-04-021-3/+0
* Use ThreadingMixIn for the simple serverPierre Ossman2019-04-021-3/+3
* Allow main script to be importedPierre Ossman2019-04-021-1/+2
* Merge pull request #382 from Nevon/ssl-key-passphraseSamuel Mannehed2019-03-133-5/+8
|\
| * Rename certificate key password optionTommy Brunn2019-03-042-4/+4
| * Add option for cert key passwordTommy Brunn2019-03-023-5/+8
|/
* Merge pull request #380 from totaam/masterSamuel Mannehed2019-02-241-3/+3
|\
| * fix handling of code: invalid unpacking, undefined variable in error path, mi...totaam2019-02-231-3/+3
|/
* Added JWT/JWS/JWE tokens capabilityUXabre2019-02-157-1/+183
* Handle connection failuresPierre Ossman2018-10-231-5/+10
* Explicitly deny text messagesPierre Ossman2018-10-231-0/+2
* Avoid : in recording file namesPierre Ossman2018-10-161-1/+1
* Merge branch 'master' of https://github.com/josedpedroso/websockifyPierre Ossman2018-09-102-22/+159
|\
| * Syslog now RFC 5424 compliant and properly identified.josedpedroso2018-08-282-22/+155
| * Port no longer included in token when using --host-tokenjosedpedroso2018-07-121-0/+7
* | Change WebSocket request handler to a mix-inPierre Ossman2018-08-152-17/+25
* | Merge branch 'master' of https://github.com/josedpedroso/websockifyPierre Ossman2018-07-111-5/+19
|\ \ | |/
| * Clarified usage of --host-token and added a section about installing Python w...josedpedroso2018-07-061-5/+19
* | Added command line options for minum SSL version and SSL ciphersTomasz Barański2018-07-051-1/+57
* | Enable setting SSL ciphers and SSL optionsTomasz Barański2018-07-052-1/+92
|/
* Added a couple of paragraphs about plugins and the new options to the README.josedpedroso2018-07-051-0/+13
* Added --host-token to allow choosing target by hostname.josedpedroso2018-07-053-12/+28
* Improved --help.josedpedroso2018-07-051-10/+10
* Added syslog support.josedpedroso2018-07-051-15/+50
* Added --web-auth option to require authentication to access the webserver.josedpedroso2018-07-054-40/+72
* Make recording Python 3 compatiblePierre Ossman2018-04-051-2/+6
* Remove policyfile from depsGiannis Kosmas2018-03-201-2/+1
* Clean up after request handlerPierre Ossman2018-03-191-0/+1
* Merge branch 'filedescriptor-fix' of https://github.com/pesintta/websockifyPierre Ossman2018-03-051-0/+1
|\
| * C websockify: Fix file descriptor leakAntti Seppälä2018-02-171-0/+1
* | Merge branch 'binary-websockets' of https://github.com/pesintta/websockifyPierre Ossman2018-03-053-21/+55
|\ \
| * | C websockify: support for binary websocket protocol with HyBi/RFC 6455.Samuel Brian2018-02-173-21/+55
| |/
* | Make sure ping/pong data is in the correct typePierre Ossman2018-02-281-2/+2
|/
* C websockify: use openssl base64 encode/decode functionsAntti Seppälä2018-02-112-7/+73
* C websockify: Load entire certificate chainAntti Seppälä2018-02-031-2/+1
* Fix handling of closed proxy socketPierre Ossman2018-01-251-1/+1
* Add recording feature to websockify.js. Closes GH-249Aaron C. de Bruyn2017-11-161-1/+52
* Merge branch 'empty-message' of https://github.com/andersk/websockifyPierre Ossman2017-11-133-27/+21
|\