aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move app mechanism to flow.pyAldo Cortesi2014-01-046-133/+137
| | | | Disable apps while message passing is improved.
* Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-041-1/+1
|\
| * fix #195Maximilian Hils2014-01-031-1/+1
| | | | | | (untested)
* | Fix app in mitmproxy console, update to bootstrap 3.Aldo Cortesi2014-01-036-80/+61
|/
* list mock as requirement (via @droope)Maximilian Hils2013-12-291-0/+1
|
* ignore web gui specific paths that won't get cleaned up when changing branchesMaximilian Hils2013-12-171-0/+2
|
* merge smurfix/fix2, add serverconnect hook docs, adjust testsMaximilian Hils2013-12-169-21/+60
|\
| * 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.
* | fix script path error in testsMaximilian Hils2013-12-152-2/+14
| |
* | add @concurrent decorator for inline scripts, fixes #176Maximilian Hils2013-12-156-9/+128
| |
* | 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-122-1/+14
| |
* | change certificate path for android, fix #171Maximilian Hils2013-12-121-2/+2
| |
* | ignore missing CN in certificates. fixes #169Maximilian Hils2013-12-123-1/+29
| |
* | store resolved ip addresses, fixes #187Maximilian Hils2013-12-123-3/+17
| |
* | Merge pull request #190 from BillinghamJ/patch-1Maximilian Hils2013-12-111-0/+3
|\ \ | | | | | | Added small note of file format
| * | Added small note of file formatJames Billingham2013-12-111-0/+3
|/ /
* | Merge remote-tracking branch 'origin/master'Maximilian Hils2013-12-112-2/+2
|\ \
| * \ Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2013-12-101-26/+19
| |\ \
| * | | Bump versionAldo Cortesi2013-12-102-2/+2
| | | |
* | | | add documentation on how to use custom certificatesMaximilian Hils2013-12-111-0/+14
| |/ / |/| |
* | | ensure binary read on windowsMaximilian Hils2013-12-101-1/+2
| |/ |/|
* | Merge remote-tracking branch 'origin/master'Maximilian Hils2013-12-091-2/+2
|\|
| * Small workaround to make mitmproxy work again.Aldo Cortesi2013-12-091-2/+2
| | | | | | | | Further work is required to make scripts work again, though.
* | remove code duplication in ProxyHandler by unifying read_transparent and ↵Maximilian Hils2013-12-091-25/+17
|/ | | | read_reverse
* backport changes to fix testsMaximilian Hils2013-12-083-5/+6
|
* Merge branch 'master' into 0.10Maximilian Hils2013-12-086-35/+61
|\
| * Merge remote-tracking branch 'origin/master'Maximilian Hils2013-12-0816-98/+162
| |\
| | * Merge pull request #134 from mhils/scripts_improvementsAldo Cortesi2013-12-0812-63/+101
| | |\ | | | | | | | | 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
| | | |/ /
| | * | | Remove obsolete test.Aldo Cortesi2013-12-081-10/+0
| | | | |
| | * | | 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
| | | | | | |
| | * | | | | Add a note to the docs about pf redirection of traffic from the host itself.Aldo Cortesi2013-12-081-0/+12
| | | | | | |
| | * | | | | Merge branch 'fix_invalid_tcp_close'Aldo Cortesi2013-12-084-3/+25
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | attempt to fix https://github.com/mitmproxy/netlib/issues/24Maximilian Hils2013-11-191-2/+2
| | | |/ / /
* | | | | | Merge remote-tracking branch 'origin/0.10' into 0.10Maximilian Hils2013-12-085-29/+34
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #161 from mitmproxy/external_webappAldo Cortesi2013-12-085-29/+34
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | External webapp
| | * | | | | | add option to expose webapp externally, remove distinct ip settingMaximilian Hils2013-08-185-29/+34
| | | | | | | |
* | | | | | | | Merge branch 'master' into 0.10Maximilian Hils2013-12-081-4/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 16:09:44 +0000