aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix request_timestamps test caseMaximilian Hils2013-06-181-1/+2
* skip tests on windows that don't make senseMaximilian Hils2013-06-182-1/+10
* update tests to reflect changes to options.scriptsMaximilian Hils2013-06-178-14/+37
* fix send_error behavior if there are no headersMaximilian Hils2013-06-171-2/+3
* Merge remote-tracking branch 'origin/scripts_improvements' into 0.10Maximilian Hils2013-06-1612-63/+101
|\
| * update test scriptMaximilian Hils2013-06-161-3/+3
| * add support for multiple scripts and script arguments. refs #76Maximilian Hils2013-06-1312-63/+101
* | Merge pull request #136 from mhils/fix_binary_rwAldo Cortesi2013-06-159-18/+18
|\ \ | |/ |/|
| * always read files in binary modeMaximilian Hils2013-06-169-18/+18
|/
* Merge pull request #132 from ipopov/masterAldo Cortesi2013-06-082-8/+9
|\
| * Use lsof instead of pfctl to find target host on OSX in transparent mode.Ivaylo Popov2013-05-272-8/+9
* | Massage content-type before sending it to mime detectionAldo Cortesi2013-06-091-0/+1
* | Make UTF environment detection more robust.Aldo Cortesi2013-06-091-2/+4
* | Fix creation of new response when none existed before.Aldo Cortesi2013-06-091-2/+7
* | Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-06-091-3/+3
|\ \
| * \ Merge pull request #129 from LordMike/masterAldo Cortesi2013-06-081-3/+3
| |\ \ | | |/ | |/|
| | * - Quick-fix for issue #128Michael Bisbjerg2013-05-211-3/+3
* | | Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-05-304-0/+106
|\| |
| * | Merge pull request #131 from squidsoup/masterAldo Cortesi2013-05-272-0/+16
| |\ \ | | |/ | |/|
| | * Added requirements.txt to ease installation of deps for hacking on mitmproxy.Kit Randel2013-05-242-0/+16
| |/
| * Merge pull request #124 from liyanage/masterAldo Cortesi2013-05-152-0/+90
| |\
| | * Add mitmproxywrapper.pyMarc Liyanage2013-05-152-0/+90
| |/
* | Update license trove classifier.Aldo Cortesi2013-05-301-1/+1
* | Update PyOpenSSL version requirement.Aldo Cortesi2013-05-202-1/+2
|/
* Make ready for pyinstaller.Aldo Cortesi2013-05-155-2/+39
* Contributor sync.Aldo Cortesi2013-05-151-14/+17
* Styling.Aldo Cortesi2013-05-151-1/+1
* Mods to "How mitmproxy works"Aldo Cortesi2013-05-141-17/+74
* README, Linux transparent mode docs, requirements additions.Aldo Cortesi2013-05-145-9/+63
* Prin an error when mitmproxy runs in a non-UTF environment.Aldo Cortesi2013-05-131-1/+7
* Adapt for new request_client_cert option in netlib.Aldo Cortesi2013-05-132-3/+5
* Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-05-051-2/+5
|\
| * Merge pull request #118 from jasonanovak/protobufsAldo Cortesi2013-05-041-2/+5
| |\
| | * Add error checking to ViewProtobufJason A. Novak2013-04-211-2/+5
| |/
* | Fix crash in client playback.Aldo Cortesi2013-05-054-8/+16
* | Minor coverage.Aldo Cortesi2013-04-302-1/+2
* | Adapt docs for website embedding.Aldo Cortesi2013-04-303-3/+6
|/
* Merge pull request #107 from rouli/masterAldo Cortesi2013-04-193-2/+58
|\
| * adding tcp and ssl setup timestamps to get better resolution on flows perform...Rouli2013-03-193-2/+53
| * Merge remote-tracking branch 'upstream/master'Rouli2013-03-1858-2369/+1060
| |\
| * \ Merge remote-tracking branch 'upstream/master'Rouli2013-02-2817-410/+628
| |\ \
| * | | adding __str__ to make export to har nicerRouli2013-02-281-0/+5
* | | | Merge pull request #112 from hamstah/protobuf-viewAldo Cortesi2013-04-193-1/+46
|\ \ \ \
| * | | | Adds a new view for protocol buffersNicolas Esteves2013-04-063-1/+46
* | | | | Merge pull request #113 from mhils/redirect_exampleAldo Cortesi2013-04-191-0/+19
|\ \ \ \ \
| * | | | | Add redirect exampleMaximilian Hils2013-04-071-0/+19
| |/ / / /
* | | | | Merge pull request #116 from afh/pull/highlight_key_helpAldo Cortesi2013-04-193-3/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Correct display mode highlight keysAlexis Hildebrandt2013-04-163-3/+11
|/ / / /
* | | | Merge pull request #101 from eentzel/keep-blank-paramsAldo Cortesi2013-04-043-3/+5
|\ \ \ \
| * | | | Keep blank URL parametersEric Entzel2013-02-113-3/+5
| |/ / /