| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/master' | Maximilian Hils | 2013-12-11 | 2 | -2/+2 |
| |\ | |||||
| | * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2013-12-10 | 1 | -26/+19 |
| | |\ | |||||
| | * | | Bump version | Aldo Cortesi | 2013-12-10 | 2 | -2/+2 |
| | | | | |||||
| * | | | add documentation on how to use custom certificates | Maximilian Hils | 2013-12-11 | 1 | -0/+14 |
| | |/ |/| | |||||
| * | | ensure binary read on windows | Maximilian Hils | 2013-12-10 | 1 | -1/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' | Maximilian Hils | 2013-12-09 | 1 | -2/+2 |
| |\| | |||||
| | * | Small workaround to make mitmproxy work again. | Aldo Cortesi | 2013-12-09 | 1 | -2/+2 |
| | | | | | | | | | Further work is required to make scripts work again, though. | ||||
| * | | remove code duplication in ProxyHandler by unifying read_transparent and ↵ | Maximilian Hils | 2013-12-09 | 1 | -25/+17 |
| |/ | | | | read_reverse | ||||
| * | backport changes to fix tests | Maximilian Hils | 2013-12-08 | 3 | -5/+6 |
| | | |||||
| * | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-12-08 | 6 | -35/+61 |
| |\ | |||||
| | * | Merge remote-tracking branch 'origin/master' | Maximilian Hils | 2013-12-08 | 16 | -98/+162 |
| | |\ | |||||
| | | * | Merge pull request #134 from mhils/scripts_improvements | Aldo Cortesi | 2013-12-08 | 12 | -63/+101 |
| | | |\ | | | | | | | | | Support multiple scripts and script arguments. refs #76 | ||||
| | | * \ | Merge pull request #166 from ghjc/forward-proxy | Aldo Cortesi | 2013-12-08 | 2 | -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 ↵ | JC | 2013-08-30 | 2 | -2/+21 |
| | | | | | | | | | | | | | | | | | | | | | another http server upstream. | ||||
| | | * | | | Merge pull request #170 from jsoriano/master | Aldo Cortesi | 2013-12-08 | 1 | -20/+17 |
| | | |\ \ \ | | | | | | | | | | | | | Reverse proxy works with SSL | ||||
| | | | * | | | New method establish_ssl to avoid duplicated code | Jaime Soriano Pastor | 2013-09-26 | 1 | -29/+15 |
| | | | | | | | |||||
| | | | * | | | Reverse proxy works with SSL | Jaime Soriano Pastor | 2013-09-26 | 1 | -2/+13 |
| | | | |/ / | |||||
| | | * | | | Remove obsolete test. | Aldo Cortesi | 2013-12-08 | 1 | -10/+0 |
| | | | | | | |||||
| | | * | | | Merge pull request #180 from mitmproxy/add_serverconnection_scripthook | Aldo Cortesi | 2013-12-08 | 2 | -0/+8 |
| | | |\ \ \ | | | | | | | | | | | | | Add serverconnection scripthook | ||||
| | | | * | | | add serverconnect script hook | Maximilian Hils | 2013-11-18 | 2 | -0/+8 |
| | | | | | | | |||||
| | | * | | | | Merge pull request #184 from richie5um/RichS-RateDivideByZeroIssue | Aldo Cortesi | 2013-12-08 | 1 | -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 same | Rich Somerfield | 2013-11-26 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Add a note to the docs about pf redirection of traffic from the host itself. | Aldo Cortesi | 2013-12-08 | 1 | -0/+12 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'fix_invalid_tcp_close' | Aldo Cortesi | 2013-12-08 | 4 | -3/+25 |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | | * | | | | attempt to fix https://github.com/mitmproxy/netlib/issues/24 | Maximilian Hils | 2013-11-19 | 1 | -2/+2 |
| | | | |/ / / | |||||
| * | | | | | | Merge remote-tracking branch 'origin/0.10' into 0.10 | Maximilian Hils | 2013-12-08 | 5 | -29/+34 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge pull request #161 from mitmproxy/external_webapp | Aldo Cortesi | 2013-12-08 | 5 | -29/+34 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | External webapp | ||||
| | | * | | | | | | add option to expose webapp externally, remove distinct ip setting | Maximilian Hils | 2013-08-18 | 5 | -29/+34 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-12-08 | 1 | -4/+3 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'origin/master' | Maximilian Hils | 2013-12-08 | 1 | -4/+3 |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| / / / | | |_|/ / / | |/| | | | | |||||
| | | * | | | | Merge pull request #173 from joebowbeer/patch-1 | Maximilian Hils | 2013-10-22 | 1 | -4/+3 |
| | | |\ \ \ \ | | | |_|/ / | | |/| | | | Update android.html | ||||
| | | | * | | | Update android.html | joebowbeer | 2013-10-18 | 1 | -4/+3 |
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | Make the sdcard path in the text consistent with the screen shot (android-shellwgetmitmproxyca.png). /sdcard/Download (singular) is the correct path. | ||||
| * | | / / | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-09-14 | 12 | -42/+103 |
| |\| | | | | |_|/ / |/| | | | |||||
| | * | | | add status images to README, include TestHTTPS again | Maximilian Hils | 2013-08-25 | 2 | -1/+3 |
| | | | | | |||||
| | * | | | exclude TestHTTPS for testing travis/coverage | Maximilian Hils | 2013-08-25 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | fix travis, loose requirements.txt | Maximilian Hils | 2013-08-25 | 2 | -15/+16 |
| | | | | | |||||
| | * | | | re-add requirements.txt | Maximilian Hils | 2013-08-25 | 1 | -0/+15 |
| | | | | | |||||
| | * | | | add coveralls.io | Maximilian Hils | 2013-08-25 | 1 | -1/+5 |
| | |/ / | |||||
| | * | | Version bump. | Aldo Cortesi | 2013-08-25 | 1 | -1/+1 |
| | | | | |||||
| | * | | Prep for release: CHANGELOG and CONTRIBUTORS | Aldo Cortesi | 2013-08-25 | 4 | -36/+53 |
| | | | | |||||
| | * | | Merge pull request #162 from mhils/add_travis_ci | Aldo Cortesi | 2013-08-22 | 2 | -0/+11 |
| | |\ \ | | | | | | | | | Add travis CI | ||||
| | | * | | add jsbeautifier to requirements.txt | Maximilian Hils | 2013-08-20 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | travis ci: fix pip install order | Maximilian Hils | 2013-08-20 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | travis ci: make sure that netlib is installed from head | Maximilian Hils | 2013-08-20 | 1 | -1/+4 |
| | | | | | |||||
| | | * | | add travis ci | Maximilian Hils | 2013-08-20 | 1 | -0/+7 |
| | | | | | |||||
| | * | | | Fix pretty_size unit tests. | Aldo Cortesi | 2013-08-23 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Tweak timing display | Aldo Cortesi | 2013-08-23 | 4 | -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. | ||||
| | * | | | Merge pull request #159 from kmanna/elapsed_time | Aldo Cortesi | 2013-08-22 | 3 | -2/+13 |
| | |\ \ \ | | |/ / | |/| | | Transfer Rate and Elapsed Time Statistics | ||||
| | | * | | console: Add support for displaying transfer rate | Kyle Manna | 2013-08-13 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | * Display the rate in the the response row. * Very handy for passive performance analysis. | ||||
| | | * | | console: Add support for displaying elapsed time | Kyle Manna | 2013-08-13 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | * Display the elapsed time in the the response row. * Very handy for passive performance analysis. | ||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |