aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix #401Maximilian Hils2014-11-071-8/+4
* fix #399Maximilian Hils2014-11-062-3/+6
* Reduce loop timeouts to improve mitmproxy responsivenessAldo Cortesi2014-11-062-4/+11
* Fix bug in flow dumping, add unit test that should have caught this in the fi...Aldo Cortesi2014-11-062-2/+16
* We don't need requests for mitmproxyAldo Cortesi2014-11-052-4/+1
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2014-11-043-11/+33
|\
| * Merge pull request #393 from onlywade/masterMaximilian Hils2014-11-012-9/+31
| |\
| | * Updating OPTIONS test with related issue number.Wade 5242014-10-311-1/+1
| | * Fixing issue #392.Wade 5242014-10-311-3/+2
| | * Adding some test coverage for handling HTTP OPTIONS requests.Wade 5242014-10-311-6/+29
| |/
| * fix #391Maximilian Hils2014-10-301-2/+2
* | Release prep: binaries build script, release checklist, fuzzingAldo Cortesi2014-11-026-6/+27
|/
* LegibilityAldo Cortesi2014-10-263-50/+128
* Fix crash while streamingAldo Cortesi2014-10-264-26/+53
* Spacing and legibilityAldo Cortesi2014-10-262-27/+72
* Start a fuzzing architecture for mitmproxyAldo Cortesi2014-10-269-9/+61
* Merge pull request #387 from onlywade/masterMaximilian Hils2014-10-251-2/+3
|\
| * Fixing issue #368.Wade 5242014-10-241-2/+3
|/
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-10-2312-225/+361
|\
| * Document http2https and https2httpAldo Cortesi2014-10-232-1/+30
| * Correct docs - we no longer support change of basic proxy mode in the console...Aldo Cortesi2014-10-232-6/+0
| * More refactoring of installation docsAldo Cortesi2014-10-232-20/+45
| * Keep sidebar ordering alphabetical, add SOCKS documentationAldo Cortesi2014-10-234-5/+17
| * CHANGELOG and CONTRIBUTORSAldo Cortesi2014-10-232-27/+84
| * First redraft of modes documentationAldo Cortesi2014-10-231-143/+155
| * Documentation re-orgAldo Cortesi2014-10-234-34/+41
* | fix typoMaximilian Hils2014-10-231-1/+1
* | update proxy modes diagramsMaximilian Hils2014-10-234-0/+0
|/
* fix #346Maximilian Hils2014-10-222-1/+16
|\
| * reverse proxy: adjust dst when reading flows, fix #346Maximilian Hils2014-09-082-2/+16
* | fix #378Maximilian Hils2014-10-221-3/+19
* | tweak SSL detection heuristicsMaximilian Hils2014-10-212-2/+17
* | fix race conditions in testsMaximilian Hils2014-10-193-0/+17
* | add generic tcp proxying, fix #374Maximilian Hils2014-10-1818-88/+250
* | remove default_caMaximilian Hils2014-10-184-8/+4
* | add test case for #375Maximilian Hils2014-10-171-0/+21
* | fix cert forwardingMaximilian Hils2014-10-091-1/+1
* | Add SOCKS5 mode, fix #305Maximilian Hils2014-10-094-11/+89
* | Merge branch 'cert_chains'Maximilian Hils2014-10-094-13/+15
|\ \
| * | add mini documentationMaximilian Hils2014-10-091-4/+6
| * | fix support for chained certificatesMaximilian Hils2014-10-084-9/+9
* | | fix typoMaximilian Hils2014-10-081-1/+1
|/ /
* | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-10-074-17/+97
|\ \
| * \ Merge pull request #371 from tekii/masterMaximilian Hils2014-10-044-17/+97
| |\ \
| | * | --replay-ignore-content & --replay-ignore-param ported from branch 0.10Marcelo Glezer2014-10-034-17/+97
| |/ /
| * | Merge pull request #369 from mitmproxy/distMaximilian Hils2014-10-012-85/+28
| |\ \
* | | | replay: carry over SNI valueMaximilian Hils2014-10-022-6/+4
| |/ / |/| |
* | | update MANIFEST.inMaximilian Hils2014-10-011-7/+7
* | | distutils -> setuptoolsMaximilian Hils2014-10-011-78/+21
|/ /
* | fix timestamp formatting: end_time may not be setMaximilian Hils2014-09-222-3/+8