Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Reverse proxy works with SSL | Jaime Soriano Pastor | 2013-09-26 | 1 | -2/+13 | |
| | |/ / | ||||||
| * | | | Merge pull request #180 from mitmproxy/add_serverconnection_scripthook | Aldo Cortesi | 2013-12-08 | 2 | -0/+8 | |
| |\ \ \ | | | | | | | | | | | Add serverconnection scripthook | |||||
| | * | | | add serverconnect script hook | Maximilian Hils | 2013-11-18 | 2 | -0/+8 | |
| | |/ / | ||||||
| * | | | Merge pull request #184 from richie5um/RichS-RateDivideByZeroIssue | Aldo Cortesi | 2013-12-08 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | Fix divide by zero issue when timestamp start and end are the same | |||||
| | * | | | Fix divide by zero issue when timestamp start and end are the same | Rich Somerfield | 2013-11-26 | 1 | -1/+1 | |
| | |/ / | ||||||
| * / / | attempt to fix https://github.com/mitmproxy/netlib/issues/24 | Maximilian Hils | 2013-11-19 | 1 | -2/+2 | |
| |/ / | ||||||
* | | | Merge pull request #161 from mitmproxy/external_webapp | Aldo Cortesi | 2013-12-08 | 4 | -25/+32 | |
|\ \ \ | | | | | | | | | External webapp | |||||
| * | | | add option to expose webapp externally, remove distinct ip setting | Maximilian Hils | 2013-08-18 | 4 | -25/+32 | |
| | | | | ||||||
* | | | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-09-14 | 5 | -6/+17 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | Version bump. | Aldo Cortesi | 2013-08-25 | 1 | -1/+1 | |
| | | | ||||||
| * | | Tweak timing display | Aldo Cortesi | 2013-08-23 | 4 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove elapsed time. Space is at a premium here, and this is somewhat redundant with the rate figure. We should display complete timing information somewhere in the detailed flow view. - Tone down the colour. Reserve highlights for stuff that should really pop out to the user. - Make rate calculation more acurate. Include header sizes. Use response start and end time, rather than request end and response end. This means that we show actual transfer rates, not including DNS requests and so forth. | |||||
| * | | console: Add support for displaying transfer rate | Kyle Manna | 2013-08-13 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | * Display the rate in the the response row. * Very handy for passive performance analysis. | |||||
| * | | console: Add support for displaying elapsed time | Kyle Manna | 2013-08-13 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | * Display the elapsed time in the the response row. * Very handy for passive performance analysis. | |||||
| * | | 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 | 31 | -344/+310 | |
|\| | | ||||||
| * | | Revamp dummy cert store | Aldo Cortesi | 2013-08-12 | 1 | -18/+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 | |
| | | | ||||||
| * | | Remove GPL notices left in source files after our change to the MIT license. | Aldo Cortesi | 2013-08-01 | 17 | -255/+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 | 1 | -5/+2 | |
| | | | | | | | | | | | | | | | | | | 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 | 4 | -33/+29 | |
| | | | | | | | | | | | | | | | | | | 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 | 5 | -19/+45 | |
| | | | ||||||
| * | | 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 #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 | |
| | | | | ||||||
| * | | | 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 | |
| |/ / | ||||||
| * | | 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. | |||||
| * | | Version bump, doc extension, URLs to github.com/mitmproxy/* | Aldo Cortesi | 2013-06-16 | 1 | -1/+1 | |
| | | | ||||||
* | | | update tests to reflect changes to options.scripts | Maximilian Hils | 2013-06-17 | 2 | -3/+6 | |
| | | | ||||||
* | | | 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 | 5 | -44/+50 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | add support for multiple scripts and script arguments. refs #76 | Maximilian Hils | 2013-06-13 | 5 | -44/+50 | |
| | | ||||||
* | | always read files in binary mode | Maximilian Hils | 2013-06-16 | 4 | -5/+5 | |
|/ | ||||||
* | 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 | |||||
* | | Fix creation of new response when none existed before. | Aldo Cortesi | 2013-06-09 | 1 | -2/+7 | |
| | | | | | | | | Fixes #133 | |||||
* | | - 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-05 | 1 | -2/+5 | |
|\ | ||||||
| * | Add error checking to ViewProtobuf | Jason A. Novak | 2013-04-21 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | There are protobufs that protoc can't parse. When protoc --decode_raw fails, it returns nothing to stdin, and writes "Failed to parse input." to stderr. Before this commit, if protoc --decode_raw couldn't parse the protobuf, the blank stdout output would get returned to the view; with this commit stderr gets caught and returned to the view. | |||||
* | | Fix crash in client playback. | Aldo Cortesi | 2013-05-05 | 1 | -0/+1 | |
| | | ||||||
* | | Minor coverage. | Aldo Cortesi | 2013-04-30 | 1 | -1/+0 | |
|/ | ||||||
* | Merge pull request #107 from rouli/master | Aldo Cortesi | 2013-04-19 | 2 | -2/+30 | |
|\ | | | | | Adding remote TCP and SSL setup timestamps |