aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 0.10Maximilian Hils2013-08-1753-456/+561
|\
| * Merge remote-tracking branch 'origin/master'Maximilian Hils2013-08-172-22/+5
| |\
| | * Revamp dummy cert storeAldo Cortesi2013-08-122-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 Cortesi2013-08-101-1/+1
| | |
| * | update gitignore to not include PyCharmsMaximilian Hils2013-08-171-0/+1
| |/
| * Remove GPL notices left in source files after our change to the MIT license.Aldo Cortesi2013-08-0119-287/+2
| | | | | | | | Thanks to Roy Shamir for reporting this.
| * Make use of a change to netlib.tcp that clarifies error conditions for flush ↵Aldo Cortesi2013-07-302-6/+3
| | | | | | | | | | | | and close. Should fix #144.
| * Show an error when attempting to decode invalid data.Aldo Cortesi2013-07-292-3/+10
| |
| * Repair minor user interface issue that caused brief flashes of duplicate ↵Aldo Cortesi2013-07-291-0/+2
| | | | | | | | flows in the flow list.
| * fix #144Maximilian Hils2013-07-281-1/+1
| | | | | | netlib wraps IOError in NetLibDisconnect, so we need to cover this as well.
| * Fix startup with no state.Aldo Cortesi2013-07-281-1/+4
| | | | | | | | Bug introduced in previous patch.
| * 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
| | | | | | | | | | | | Reduce some state duplication, by removing currentflow variable. Fixes #141
| * Properly terminate SSL server connections.Aldo Cortesi2013-07-281-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 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 ↵Aldo Cortesi2013-07-132-2/+3
| | | | | | | | compatiblity.
| * Merge pull request #143 from liyanage/upstream-pull-request-2013-07-07Aldo Cortesi2013-07-111-16/+70
| |\ | | | | | | Some improvements for the OS X mitmproxywrapper.py script
| | * 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
| | | | | | | | | | | | one.
| * | Merge pull request #137 from caujka/masterAldo Cortesi2013-07-011-1/+1
| |\ \ | | | | | | | | Handling for EOF reading error in gzipped content
| | * | 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
| |\ \ \ | | |/ / | |/| | Close connection when flush fails
| | * | 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 ↵Aldo Cortesi2013-06-161-3/+0
| | | | | | | | | | | | Mountain Lion.
| * | Revert "Use lsof instead of pfctl to find target host on OSX in transparent ↵Aldo Cortesi2013-06-162-9/+8
| | | | | | | | | | | | | | | | | | mode." This reverts commit ffeede9b39c8d269766fd56d02eb7e78d8d13bb2.
| * | 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 ↵Aldo Cortesi2013-06-163-36/+16
| | | | | | | | | | | | binaries.
| * | 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
| |\ \ | | | | | | | | Documentation for adding a new content viewer / View class
| | * | 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
| | | |
* | | | fix request_timestamps test caseMaximilian Hils2013-06-181-1/+2
| | | |
* | | | skip tests on windows that don't make senseMaximilian Hils2013-06-182-1/+10
| | | |
* | | | update tests to reflect changes to options.scriptsMaximilian Hils2013-06-178-14/+37
| | | |
* | | | fix send_error behavior if there are no headersMaximilian Hils2013-06-171-2/+3
| | | |
* | | | Merge remote-tracking branch 'origin/scripts_improvements' into 0.10Maximilian Hils2013-06-1612-63/+101
|\ \ \ \ | |/ / / |/| | |
| * | | update test scriptMaximilian Hils2013-06-161-3/+3
| | | |
| * | | add support for multiple scripts and script arguments. refs #76Maximilian Hils2013-06-1312-63/+101
| | | |
* | | | Merge pull request #136 from mhils/fix_binary_rwAldo Cortesi2013-06-159-18/+18
|\ \ \ \ | |/ / / |/| | | always read files in binary mode
| * | | always read files in binary modeMaximilian Hils2013-06-169-18/+18
|/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-15 15:39:04 +0000