| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | utils: Add missing "B" for pretty_size() | Kyle Manna | 2013-08-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | * Add missing unit for megabytes, should print "MB". | |||||
| * | | | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-08-17 | 53 | -456/+561 | |
| |\| | | | ||||||
| | * | | | Merge remote-tracking branch 'origin/master' | Maximilian Hils | 2013-08-17 | 2 | -22/+5 | |
| | |\| | | ||||||
| | | * | | Revamp dummy cert store | Aldo Cortesi | 2013-08-12 | 2 | -21/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | We no longer keep these on disk. This is for a number of reasons, including some race conditions and the fact that some valid IDNA-encoded domain names are not valid file names on Windows. | |||||
| | | * | | Better handling of cert errors on connection. | Aldo Cortesi | 2013-08-10 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | update gitignore to not include PyCharms | Maximilian Hils | 2013-08-17 | 1 | -0/+1 | |
| | |/ / | ||||||
| | * | | Remove GPL notices left in source files after our change to the MIT license. | Aldo Cortesi | 2013-08-01 | 19 | -287/+2 | |
| | | | | | | | | | | | | | Thanks to Roy Shamir for reporting this. | |||||
| | * | | Make use of a change to netlib.tcp that clarifies error conditions for flush ↵ | Aldo Cortesi | 2013-07-30 | 2 | -6/+3 | |
| | | | | | | | | | | | | | | | | | | | and close. Should fix #144. | |||||
| | * | | Show an error when attempting to decode invalid data. | Aldo Cortesi | 2013-07-29 | 2 | -3/+10 | |
| | | | | ||||||
| | * | | Repair minor user interface issue that caused brief flashes of duplicate ↵ | Aldo Cortesi | 2013-07-29 | 1 | -0/+2 | |
| | | | | | | | | | | | | | flows in the flow list. | |||||
| | * | | fix #144 | Maximilian Hils | 2013-07-28 | 1 | -1/+1 | |
| | | | | | | | | | | netlib wraps IOError in NetLibDisconnect, so we need to cover this as well. | |||||
| | * | | 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 | |
| | | | | | | ||||||
| * | | | | | fix request_timestamps test case | Maximilian Hils | 2013-06-18 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | skip tests on windows that don't make sense | Maximilian Hils | 2013-06-18 | 2 | -1/+10 | |
| | | | | | | ||||||
| * | | | | | update tests to reflect changes to options.scripts | Maximilian Hils | 2013-06-17 | 8 | -14/+37 | |
| | | | | | | ||||||
| * | | | | | fix send_error behavior if there are no headers | Maximilian Hils | 2013-06-17 | 1 | -2/+3 | |
| | | | | | | ||||||
| * | | | | | Merge remote-tracking branch 'origin/scripts_improvements' into 0.10 | Maximilian Hils | 2013-06-16 | 12 | -63/+101 | |
| |\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | ||||||
| | * | | | update test script | Maximilian Hils | 2013-06-16 | 1 | -3/+3 | |
| | | | | | ||||||
| | * | | | add support for multiple scripts and script arguments. refs #76 | Maximilian Hils | 2013-06-13 | 12 | -63/+101 | |
| | | | | | ||||||
| * | | | | Merge pull request #136 from mhils/fix_binary_rw | Aldo Cortesi | 2013-06-15 | 9 | -18/+18 | |
| |\ \ \ \ | |/ / / |/| | | | always read files in binary mode | |||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |