aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* proxy.py: Catch channel.ask() returning None when terminatingMatthias Urlichs2013-06-281-1/+1
* Close connection when flush failsMatthias Urlichs2013-06-261-0/+3
* Minor adjustment for website docs pages.Aldo Cortesi2013-06-161-0/+3
* Update changelog. Move to lsof for transparent OSX is not working on Mountain...Aldo Cortesi2013-06-161-3/+0
* Revert "Use lsof instead of pfctl to find target host on OSX in transparent m...Aldo Cortesi2013-06-162-9/+8
* CHANGELOG and CONTRIBUTORSAldo Cortesi2013-06-162-14/+34
* Formalize OSX binary script a bit more.Aldo Cortesi2013-06-161-5/+12
* Remove pyinstaller specs. Add a quick-and-dirty script for building OSX binar...Aldo Cortesi2013-06-163-36/+16
* Version bump, doc extension, URLs to github.com/mitmproxy/*Aldo Cortesi2013-06-1610-42/+109
* Merge pull request #119 from jasonanovak/ViewDocumentationAldo Cortesi2013-06-153-1/+39
|\
| * Finalizing documentationJason A. Novak2013-04-212-3/+2
| * Further cleanup of documentationJason A. Novak2013-04-212-8/+9
| * More documentation cleanup and formattingJason A. Novak2013-04-212-7/+16
| * More documentationJason A. Novak2013-04-211-6/+3
| * More documentationJason A. Novak2013-04-211-3/+5
| * Continue work on documentation of adding viewsJason A. Novak2013-04-211-1/+2
| * Begin work on documenting adding a new viewJason A. Novak2013-04-214-2/+31
* | 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
| |\