aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Collapse)AuthorAgeFilesLines
* Fix app in mitmproxy console, update to bootstrap 3.Aldo Cortesi2014-01-036-80/+61
|
* merge smurfix/fix2, add serverconnect hook docs, adjust testsMaximilian Hils2013-12-162-4/+18
|\
| * Reconnect if the server-connect hook needs the request to decide what to doMatthias Urlichs2013-12-121-4/+12
| |
| * handle a hook changing connection parametersMatthias Urlichs2013-12-121-1/+6
| |
| * serverconnect hook: Set sc.requestMatthias Urlichs2013-12-121-2/+3
| | | | | | | | | | | | | | The serverconnect hook script might need to examine the incoming request in order to set up the server connection. Example use: bind to a distinct source IPv6 address for each client.
* | add @concurrent decorator for inline scripts, fixes #176Maximilian Hils2013-12-151-1/+25
| |
* | Merge pull request #189 from mitmproxy/refactor_proxyhandlerAldo Cortesi2013-12-131-74/+87
|\ \ | |/ |/| Refactor ProxyHandler
| * add commentsMaximilian Hils2013-12-101-1/+18
| |
| * refactor ProxyHandler, remove duplicate codeMaximilian Hils2013-12-101-74/+70
| |
* | add content-length 0 if we remove header for chunked encoding, fixes #186Maximilian Hils2013-12-121-0/+2
| |
* | ignore missing CN in certificates. fixes #169Maximilian Hils2013-12-121-1/+2
| |
* | store resolved ip addresses, fixes #187Maximilian Hils2013-12-122-3/+12
| |
* | Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-12-101-26/+19
|\ \
| * | ensure binary read on windowsMaximilian Hils2013-12-101-1/+2
| |/
| * Merge remote-tracking branch 'origin/master'Maximilian Hils2013-12-091-2/+2
| |\
| * | remove code duplication in ProxyHandler by unifying read_transparent and ↵Maximilian Hils2013-12-091-25/+17
| | | | | | | | | | | | read_reverse
* | | Bump versionAldo Cortesi2013-12-101-1/+1
| |/ |/|
* | Small workaround to make mitmproxy work again.Aldo Cortesi2013-12-091-2/+2
|/ | | | Further work is required to make scripts work again, though.
* backport changes to fix testsMaximilian Hils2013-12-081-2/+3
|
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 01:23:22 +0000