aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' into 0.10Maximilian Hils2013-12-084-25/+49
|\
| * Merge pull request #134 from mhils/scripts_improvementsAldo Cortesi2013-12-085-44/+50
| |\ | | | | | | Support multiple scripts and script arguments. refs #76
| * \ Merge pull request #166 from ghjc/forward-proxyAldo Cortesi2013-12-082-2/+21
| |\ \ | | | | | | | | Added -F http[s]://server:port option that allows MITM to forward traffi...
| | * | Added -F http[s]://server:port option that allows MITM to forward traffic to ↵JC2013-08-302-2/+21
| | | | | | | | | | | | | | | | another http server upstream.
| * | | Merge pull request #170 from jsoriano/masterAldo Cortesi2013-12-081-20/+17
| |\ \ \ | | | | | | | | | | Reverse proxy works with SSL
| | * | | New method establish_ssl to avoid duplicated codeJaime Soriano Pastor2013-09-261-29/+15
| | | | |
| | * | | Reverse proxy works with SSLJaime Soriano Pastor2013-09-261-2/+13
| | |/ /
| * | | Merge pull request #180 from mitmproxy/add_serverconnection_scripthookAldo Cortesi2013-12-082-0/+8
| |\ \ \ | | | | | | | | | | Add serverconnection scripthook
| | * | | add serverconnect script hookMaximilian Hils2013-11-182-0/+8
| | |/ /
| * | | Merge pull request #184 from richie5um/RichS-RateDivideByZeroIssueAldo Cortesi2013-12-081-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 sameRich Somerfield2013-11-261-1/+1
| | |/ /
| * / / attempt to fix https://github.com/mitmproxy/netlib/issues/24Maximilian Hils2013-11-191-2/+2
| |/ /
* | | Merge pull request #161 from mitmproxy/external_webappAldo Cortesi2013-12-084-25/+32
|\ \ \ | | | | | | | | External webapp
| * | | add option to expose webapp externally, remove distinct ip settingMaximilian Hils2013-08-184-25/+32
| | | |
* | | | Merge branch 'master' into 0.10Maximilian Hils2013-09-145-6/+17
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Version bump.Aldo Cortesi2013-08-251-1/+1
| | |
| * | Tweak timing displayAldo Cortesi2013-08-234-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 rateKyle Manna2013-08-131-0/+3
| | | | | | | | | | | | | | | * Display the rate in the the response row. * Very handy for passive performance analysis.
| * | console: Add support for displaying elapsed timeKyle Manna2013-08-132-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 Manna2013-08-131-1/+1
| | | | | | | | | | | | * Add missing unit for megabytes, should print "MB".
* | | Merge branch 'master' into 0.10Maximilian Hils2013-08-1731-344/+310
|\| |
| * | Revamp dummy cert storeAldo Cortesi2013-08-121-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 Cortesi2013-08-101-1/+1
| | |
| * | Remove GPL notices left in source files after our change to the MIT license.Aldo Cortesi2013-08-0117-255/+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-301-5/+2
| | | | | | | | | | | | | | | | | | 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-284-33/+29
| | | | | | | | | | | | | | | | | | 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-245-19/+45
| | |
| * | 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 #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
| | | |
| * | | proxy.py: Catch channel.ask() returning None when terminatingMatthias Urlichs2013-06-281-1/+1
| | | |
| * | | Close connection when flush failsMatthias Urlichs2013-06-261-0/+3
| |/ /
| * | 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.
| * | Version bump, doc extension, URLs to github.com/mitmproxy/*Aldo Cortesi2013-06-161-1/+1
| | |
* | | update tests to reflect changes to options.scriptsMaximilian Hils2013-06-172-3/+6
| | |
* | | 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-165-44/+50
|\ \ \ | |/ / |/| / | |/
| * add support for multiple scripts and script arguments. refs #76Maximilian Hils2013-06-135-44/+50
| |
* | always read files in binary modeMaximilian Hils2013-06-164-5/+5
|/
* Merge pull request #132 from ipopov/masterAldo Cortesi2013-06-082-8/+9
|\ | | | | A humble pull request
| * 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
| | | | | | | | Fixes #67
* | Fix creation of new response when none existed before.Aldo Cortesi2013-06-091-2/+7
| | | | | | | | Fixes #133
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 02:22:35 +0000