Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'master' into tcp_proxy | Maximilian Hils | 2014-01-18 | 1 | -1/+1 | |
| |\ | ||||||
| * | | fix tests, remove duplicate code | Maximilian Hils | 2014-01-09 | 2 | -55/+38 | |
| * | | Merge remote-tracking branch 'origin/master' into tcp_proxy | Maximilian Hils | 2014-01-09 | 4 | -61/+45 | |
| |\ \ | ||||||
| * | | | change parameter names to reflect changes | Maximilian Hils | 2014-01-09 | 2 | -17/+14 | |
* | | | | Silence pyflakes, adjust requirements.txt | Aldo Cortesi | 2014-01-19 | 1 | -1/+0 | |
| |_|/ |/| | | ||||||
* | | | add CONNECT request to list of request types that don't have a response body | Maximilian Hils | 2014-01-18 | 1 | -1/+1 | |
| |/ |/| | ||||||
* | | Make certificate not-before time 48 hours. | Aldo Cortesi | 2014-01-08 | 1 | -1/+1 | |
* | | Merge pull request #26 from mitmproxy/refactor_read_http_body | Aldo Cortesi | 2014-01-04 | 2 | -57/+40 | |
|\ \ | ||||||
| * | | refactor read_http_body | Maximilian Hils | 2013-12-15 | 2 | -57/+40 | |
| |/ | ||||||
* / | Make it possible to pass custom environment variables into wsgi apps. | Aldo Cortesi | 2014-01-05 | 1 | -3/+4 | |
|/ | ||||||
* | merge smurfix/ipv6, add ipv6 support for TCPServer, add ipv6 test | Maximilian Hils | 2013-12-13 | 2 | -10/+14 | |
|\ | ||||||
| * | tab fix | Matthias Urlichs | 2013-12-12 | 1 | -1/+1 | |
| * | support ipv6 | Matthias Urlichs | 2013-12-12 | 1 | -4/+4 | |
* | | add requirements.txt, small changes | Maximilian Hils | 2013-12-13 | 2 | -2/+4 | |
|/ | ||||||
* | Bump version | Aldo Cortesi | 2013-12-10 | 1 | -1/+1 | |
* | Fix race condition in test suite. | Aldo Cortesi | 2013-12-08 | 1 | -1/+0 | |
* | merge origin/master | Maximilian Hils | 2013-12-08 | 6 | -46/+40 | |
|\ | ||||||
| * | Unit test auth actions. | Aldo Cortesi | 2013-12-08 | 1 | -10/+7 | |
| * | Domain checks for persistent cert store is now irrelevant. | Aldo Cortesi | 2013-12-08 | 2 | -16/+3 | |
| * | Merge pull request #19 from rouli/ciphersuites | Aldo Cortesi | 2013-12-07 | 2 | -2/+5 | |
| |\ | ||||||
| | * | adding cipher list selection option to BaseHandler | Israel Nir | 2013-08-21 | 2 | -2/+5 | |
| * | | Merge pull request #22 from fictivekin/custom-o-cn | Aldo Cortesi | 2013-12-07 | 1 | -6/+9 | |
| |\ \ | ||||||
| | * | | allow specification of o, cn, expiry | Sean Coates | 2013-10-07 | 1 | -6/+9 | |
| * | | | Merge branch 'fix_invalid_tcp_close' | Aldo Cortesi | 2013-12-08 | 3 | -14/+9 | |
| |\ \ \ | ||||||
| | * | | | Fix client certificate request feature. | Aldo Cortesi | 2013-12-08 | 1 | -2/+2 | |
| | * | | | Merge branch 'fix_windows_bugs' into fix_invalid_tcp_close | Maximilian Hils | 2013-11-19 | 2 | -1/+5 | |
| | |\ \ \ | ||||||
| | | * | | | compatibility fixes for windows | Maximilian Hils | 2013-08-19 | 2 | -2/+3 | |
| | | * | | | fix windows bugs | Maximilian Hils | 2013-08-17 | 1 | -0/+3 | |
| | | | |/ | | | |/| | ||||||
| | * | | | attempt to fix #24 | Maximilian Hils | 2013-11-19 | 1 | -13/+4 | |
| * | | | | Merge branch 'master' of ssh.github.com:cortesi/netlib | Aldo Cortesi | 2013-11-21 | 1 | -0/+44 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' of ssh.github.com:cortesi/netlib | Aldo Cortesi | 2013-10-18 | 1 | -11/+3 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| * | | | | | Bump version. | Aldo Cortesi | 2013-08-25 | 1 | -1/+1 | |
| * | | | | | Handle interrupted system call errors. | Aldo Cortesi | 2013-08-25 | 1 | -1/+7 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | make AuthAction generic | Maximilian Hils | 2013-12-08 | 1 | -5/+5 | |
| |_|/ / |/| | | | ||||||
* | | | | add custom argparse actions to seamlessly integrate ProxyAuth classes | Maximilian Hils | 2013-11-21 | 1 | -0/+44 | |
| |/ / |/| | | ||||||
* | | | remove tempfile and shutil imports because they're not actually used | Sean Coates | 2013-10-07 | 1 | -1/+1 | |
| |/ |/| | ||||||
* | | Don't create a certificate request when creating a dummy cert | Paul | 2013-09-24 | 1 | -10/+2 | |
|/ | ||||||
* | Revamp dummy cert generation. | Aldo Cortesi | 2013-08-12 | 3 | -35/+20 | |
* | Correct order of precedence for SSL errors. | Aldo Cortesi | 2013-08-11 | 1 | -2/+2 | |
* | Better handling of cert errors. | Aldo Cortesi | 2013-08-10 | 1 | -0/+3 | |
* | Clarify the interface for flush and close methods. | Aldo Cortesi | 2013-07-30 | 1 | -5/+5 | |
* | Merge pull request #16 from mitmproxy/fix_socket_buffer | Aldo Cortesi | 2013-07-28 | 1 | -3/+12 | |
|\ | ||||||
| * | attempt to fix 'half-duplex' TCP close sequence | Maximilian Hils | 2013-06-17 | 1 | -3/+12 | |
* | | Add socket binding support for TCPClient | Andrey Plotnikov | 2013-07-07 | 1 | -1/+4 | |
|/ | ||||||
* | Bump version. | Aldo Cortesi | 2013-06-16 | 1 | -1/+1 | |
* | always read files in binary mode | Maximilian Hils | 2013-06-16 | 1 | -6/+6 | |
* | Add a request_client_cert argument to server SSL conversion. | Aldo Cortesi | 2013-05-13 | 3 | -8/+18 | |
* | Fix exception hierarchy. | Aldo Cortesi | 2013-05-05 | 1 | -2/+2 | |
* | extensions aren't supported in v1, set to v3 (value=2) if using them. | Tim Becker | 2013-04-19 | 1 | -0/+1 | |
* | Sync version number with mitmproxy. | Aldo Cortesi | 2013-03-05 | 1 | -1/+1 |