aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix #144Maximilian Hils2013-07-281-1/+1
* Fix startup with no state.Aldo Cortesi2013-07-281-1/+4
* Terminate can be called on an unconnected server connection.Aldo Cortesi2013-07-281-8/+9
* Some refactoring of the console inteface.Aldo Cortesi2013-07-285-34/+30
* Properly terminate SSL server connections.Aldo Cortesi2013-07-281-1/+3
* Move app instantiation out of proxy.py.Aldo Cortesi2013-07-248-24/+57
* Make a start on mitmproxy web app.Aldo Cortesi2013-07-2311-2/+198
* Don't take minor version into account when checking serialized data compatibl...Aldo Cortesi2013-07-132-2/+3
* Merge pull request #143 from liyanage/upstream-pull-request-2013-07-07Aldo Cortesi2013-07-111-16/+70
|\
| * Pass extra command line arguments to mitmproxyMarc Liyanage2013-07-081-5/+13
| * Re-run mitmproxywrapper.py with sudo if necessary.Marc Liyanage2013-06-021-0/+9
| * Change the proxy settings for all connected interfaces, not just the primary ...Marc Liyanage2013-05-151-12/+49
* | Merge pull request #137 from caujka/masterAldo Cortesi2013-07-011-1/+1
|\ \
| * | Added handling for EOF reading error in gzipped content.Oleksandr Sheremet2013-06-171-1/+1
* | | Merge pull request #139 from smurfix/fixesAldo Cortesi2013-07-011-1/+4
|\ \ \ | |/ / |/| |
| * | 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