aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
|\ \ | |/ |/|
| * 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 read...Maximilian Hils2013-12-091-25/+17
* | | Bump versionAldo Cortesi2013-12-101-1/+1
| |/ |/|
* | Small workaround to make mitmproxy work again.Aldo Cortesi2013-12-091-2/+2
|/
* 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
| |\
| * \ 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 traffic to ...JC2013-08-302-2/+21
| * | | Merge pull request #170 from jsoriano/masterAldo Cortesi2013-12-081-20/+17
| |\ \ \
| | * | | 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 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 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
|\ \ \
| * | | 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
| * | console: Add support for displaying transfer rateKyle Manna2013-08-131-0/+3
| * | console: Add support for displaying elapsed timeKyle Manna2013-08-132-1/+9
| * | utils: Add missing "B" for pretty_size()Kyle Manna2013-08-131-1/+1
* | | Merge branch 'master' into 0.10Maximilian Hils2013-08-1731-344/+310
|\| |
| * | Revamp dummy cert storeAldo Cortesi2013-08-121-18/+4
| * | 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
| * | Make use of a change to netlib.tcp that clarifies error conditions for flush ...Aldo Cortesi2013-07-301-5/+2
| * | 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 flow...Aldo Cortesi2013-07-291-0/+2
| * | fix #144Maximilian Hils2013-07-281-1/+1
| * | Fix startup with no state.Aldo Cortesi2013-07-281-1/+4
| * | 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
| * | Properly terminate SSL server connections.Aldo Cortesi2013-07-281-1/+3