Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix startup with no state. | Aldo Cortesi | 2013-07-28 | 1 | -1/+4 |
| | | | | Bug introduced in previous patch. | ||||
* | Terminate can be called on an unconnected server connection. | Aldo Cortesi | 2013-07-28 | 1 | -8/+9 |
| | |||||
* | Some refactoring of the console inteface. | Aldo Cortesi | 2013-07-28 | 5 | -34/+30 |
| | | | | | | Reduce some state duplication, by removing currentflow variable. Fixes #141 | ||||
* | Properly terminate SSL server connections. | Aldo Cortesi | 2013-07-28 | 1 | -1/+3 |
| | | | | | | Before, we had dangling SSL server connections causing resource exhaustion. I believe this fixe #144 and #153 | ||||
* | Move app instantiation out of proxy.py. | Aldo Cortesi | 2013-07-24 | 8 | -24/+57 |
| | |||||
* | Make a start on mitmproxy web app. | Aldo Cortesi | 2013-07-23 | 11 | -2/+198 |
| | |||||
* | Don't take minor version into account when checking serialized data ↵ | Aldo Cortesi | 2013-07-13 | 2 | -2/+3 |
| | | | | compatiblity. | ||||
* | Merge pull request #143 from liyanage/upstream-pull-request-2013-07-07 | Aldo Cortesi | 2013-07-11 | 1 | -16/+70 |
|\ | | | | | Some improvements for the OS X mitmproxywrapper.py script | ||||
| * | Pass extra command line arguments to mitmproxy | Marc Liyanage | 2013-07-08 | 1 | -5/+13 |
| | | |||||
| * | Re-run mitmproxywrapper.py with sudo if necessary. | Marc Liyanage | 2013-06-02 | 1 | -0/+9 |
| | | |||||
| * | Change the proxy settings for all connected interfaces, not just the primary ↵ | Marc Liyanage | 2013-05-15 | 1 | -12/+49 |
| | | | | | | | | one. | ||||
* | | Merge pull request #137 from caujka/master | Aldo Cortesi | 2013-07-01 | 1 | -1/+1 |
|\ \ | | | | | | | Handling for EOF reading error in gzipped content | ||||
| * | | Added handling for EOF reading error in gzipped content. | Oleksandr Sheremet | 2013-06-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #139 from smurfix/fixes | Aldo Cortesi | 2013-07-01 | 1 | -1/+4 |
|\ \ \ | |/ / |/| | | Close connection when flush fails | ||||
| * | | proxy.py: Catch channel.ask() returning None when terminating | Matthias Urlichs | 2013-06-28 | 1 | -1/+1 |
| | | | |||||
| * | | Close connection when flush fails | Matthias Urlichs | 2013-06-26 | 1 | -0/+3 |
|/ / | |||||
* | | Minor adjustment for website docs pages. | Aldo Cortesi | 2013-06-16 | 1 | -0/+3 |
| | | |||||
* | | Update changelog. Move to lsof for transparent OSX is not working on ↵ | Aldo Cortesi | 2013-06-16 | 1 | -3/+0 |
| | | | | | | | | Mountain Lion. | ||||
* | | Revert "Use lsof instead of pfctl to find target host on OSX in transparent ↵ | Aldo Cortesi | 2013-06-16 | 2 | -9/+8 |
| | | | | | | | | | | | | mode." This reverts commit ffeede9b39c8d269766fd56d02eb7e78d8d13bb2. | ||||
* | | CHANGELOG and CONTRIBUTORS | Aldo Cortesi | 2013-06-16 | 2 | -14/+34 |
| | | |||||
* | | Formalize OSX binary script a bit more. | Aldo Cortesi | 2013-06-16 | 1 | -5/+12 |
| | | |||||
* | | Remove pyinstaller specs. Add a quick-and-dirty script for building OSX ↵ | Aldo Cortesi | 2013-06-16 | 3 | -36/+16 |
| | | | | | | | | binaries. | ||||
* | | Version bump, doc extension, URLs to github.com/mitmproxy/* | Aldo Cortesi | 2013-06-16 | 10 | -42/+109 |
| | | |||||
* | | Merge pull request #119 from jasonanovak/ViewDocumentation | Aldo Cortesi | 2013-06-15 | 3 | -1/+39 |
|\ \ | | | | | | | Documentation for adding a new content viewer / View class | ||||
| * | | Finalizing documentation | Jason A. Novak | 2013-04-21 | 2 | -3/+2 |
| | | | |||||
| * | | Further cleanup of documentation | Jason A. Novak | 2013-04-21 | 2 | -8/+9 |
| | | | |||||
| * | | More documentation cleanup and formatting | Jason A. Novak | 2013-04-21 | 2 | -7/+16 |
| | | | |||||
| * | | More documentation | Jason A. Novak | 2013-04-21 | 1 | -6/+3 |
| | | | |||||
| * | | More documentation | Jason A. Novak | 2013-04-21 | 1 | -3/+5 |
| | | | |||||
| * | | Continue work on documentation of adding views | Jason A. Novak | 2013-04-21 | 1 | -1/+2 |
| | | | |||||
| * | | Begin work on documenting adding a new view | Jason A. Novak | 2013-04-21 | 4 | -2/+31 |
| | | | |||||
* | | | Merge pull request #136 from mhils/fix_binary_rw | Aldo Cortesi | 2013-06-15 | 9 | -18/+18 |
|\ \ \ | | | | | | | | | always read files in binary mode | ||||
| * | | | always read files in binary mode | Maximilian Hils | 2013-06-16 | 9 | -18/+18 |
|/ / / | |||||
* | | | Merge pull request #132 from ipopov/master | Aldo Cortesi | 2013-06-08 | 2 | -8/+9 |
|\ \ \ | | | | | | | | | A humble pull request | ||||
| * | | | Use lsof instead of pfctl to find target host on OSX in transparent mode. | Ivaylo Popov | 2013-05-27 | 2 | -8/+9 |
| | | | | |||||
* | | | | Massage content-type before sending it to mime detection | Aldo Cortesi | 2013-06-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Fixes #67 | ||||
* | | | | Make UTF environment detection more robust. | Aldo Cortesi | 2013-06-09 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | Fixes #125 | ||||
* | | | | Fix creation of new response when none existed before. | Aldo Cortesi | 2013-06-09 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | Fixes #133 | ||||
* | | | | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2013-06-09 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #129 from LordMike/master | Aldo Cortesi | 2013-06-08 | 1 | -3/+3 |
| |\ \ \ \ | | |/ / / | |/| | | | Quick fix for issue #128 | ||||
| | * | | | - Quick-fix for issue #128 | Michael Bisbjerg | 2013-05-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | New bug: It correct-cases Content-Length for any webserver sending other casings, like CONTENT-LENGTH. | ||||
* | | | | | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2013-05-30 | 4 | -0/+106 |
|\| | | | | |||||
| * | | | | Merge pull request #131 from squidsoup/master | Aldo Cortesi | 2013-05-27 | 2 | -0/+16 |
| |\ \ \ \ | | |/ / / | |/| | | | Easy dep install with pip | ||||
| | * | | | Added requirements.txt to ease installation of deps for hacking on mitmproxy. | Kit Randel | 2013-05-24 | 2 | -0/+16 |
| |/ / / | |||||
| * | | | Merge pull request #124 from liyanage/master | Aldo Cortesi | 2013-05-15 | 2 | -0/+90 |
| |\ \ \ | | | |/ | | |/| | Add mitmproxywrapper.py script for OS X users | ||||
| | * | | Add mitmproxywrapper.py | Marc Liyanage | 2013-05-15 | 2 | -0/+90 |
| |/ / | |||||
* | | | Update license trove classifier. | Aldo Cortesi | 2013-05-30 | 1 | -1/+1 |
| | | | |||||
* | | | Update PyOpenSSL version requirement. | Aldo Cortesi | 2013-05-20 | 2 | -1/+2 |
|/ / | |||||
* | | Make ready for pyinstaller. | Aldo Cortesi | 2013-05-15 | 5 | -2/+39 |
| | | |||||
* | | Contributor sync. | Aldo Cortesi | 2013-05-15 | 1 | -14/+17 |
| | |