| Commit message (Expand) | Author | Age | Files | Lines |
* | add skeleton to change destinatin server during intercept, fix all testcases ... | Maximilian Hils | 2014-02-05 | 1 | -8/+10 |
* | fix all tests except those using set_url and get_url | Maximilian Hils | 2014-02-05 | 1 | -2/+6 |
* | push failing tests down to 43 | Maximilian Hils | 2014-02-04 | 1 | -20/+22 |
* | add priorities for the destination server address | Maximilian Hils | 2014-02-04 | 1 | -34/+99 |
* | bring failing tests back into the double-digit range | Maximilian Hils | 2014-01-31 | 1 | -4/+5 |
* | remove _flow_map from state, improve logging | Maximilian Hils | 2014-01-31 | 1 | -2/+14 |
* | fix server reconnect | Maximilian Hils | 2014-01-31 | 1 | -2/+3 |
* | move StateObject back into libmproxy | Maximilian Hils | 2014-01-31 | 1 | -6/+34 |
* | complete state handling | Maximilian Hils | 2014-01-30 | 1 | -4/+12 |
* | add generic TCP handler with SSL support, move StateObject into netlib | Maximilian Hils | 2014-01-30 | 1 | -36/+40 |
* | remove old classes | Maximilian Hils | 2014-01-30 | 1 | -0/+8 |
* | merge flow classes. current status: basic mitmdump working | Maximilian Hils | 2014-01-30 | 1 | -7/+22 |
* | fix most testsuite errors, improve proxy error handling | Maximilian Hils | 2014-01-29 | 1 | -11/+17 |
* | unify ipv4/ipv6 address handling | Maximilian Hils | 2014-01-28 | 1 | -28/+21 |
* | merge master | Maximilian Hils | 2014-01-22 | 1 | -1/+0 |
|\ |
|
| * | Silence pyflakes | Aldo Cortesi | 2014-01-19 | 1 | -9/+6 |
| * | fix sni bug: respond with the correct certificate | Maximilian Hils | 2014-01-16 | 1 | -5/+5 |
| * | Start refactoring scripts | Aldo Cortesi | 2014-01-12 | 1 | -3/+3 |
* | | Add functionality to transparently proxify connections to other HTTPS proxies | Maximilian Hils | 2014-01-18 | 1 | -2/+2 |
* | | get server reconnect right, fix timestamps | Maximilian Hils | 2014-01-18 | 1 | -32/+43 |
* | | small refactorings, bugs fixed | Maximilian Hils | 2014-01-18 | 1 | -4/+10 |
* | | add basic error handling | Maximilian Hils | 2014-01-13 | 1 | -10/+2 |
* | | fix header assembly, other improvements | Maximilian Hils | 2014-01-10 | 1 | -3/+7 |
* | | improve https handling | Maximilian Hils | 2014-01-09 | 1 | -16/+27 |
* | | groundwork completed | Maximilian Hils | 2014-01-09 | 1 | -63/+105 |
* | | continue work on the proxyhandler | Maximilian Hils | 2014-01-07 | 1 | -91/+62 |
|\| |
|
| * | Merge pull request #192 from mitmproxy/refactor_read_http_body | Aldo Cortesi | 2014-01-04 | 1 | -4/+14 |
| |\ |
|
| | * | move CONTINUE checks into mitmproxy | Maximilian Hils | 2013-12-15 | 1 | -4/+14 |
| * | | Introduce file descriptor decorators for Request objects | Aldo Cortesi | 2014-01-05 | 1 | -4/+11 |
| * | | Decouple message type from message class name. | Aldo Cortesi | 2014-01-04 | 1 | -10/+10 |
| * | | Move app mechanism to flow.py | Aldo Cortesi | 2014-01-04 | 1 | -96/+66 |
* | | | first steps on tcp proxying | Maximilian Hils | 2014-01-05 | 1 | -357/+91 |
|/ / |
|
* | | merge smurfix/fix2, add serverconnect hook docs, adjust tests | Maximilian Hils | 2013-12-16 | 1 | -3/+17 |
|\ \
| |/
|/| |
|
| * | Reconnect if the server-connect hook needs the request to decide what to do | Matthias Urlichs | 2013-12-12 | 1 | -4/+12 |
| * | handle a hook changing connection parameters | Matthias Urlichs | 2013-12-12 | 1 | -1/+6 |
| * | serverconnect hook: Set sc.request | Matthias Urlichs | 2013-12-12 | 1 | -2/+3 |
* | | Merge pull request #189 from mitmproxy/refactor_proxyhandler | Aldo Cortesi | 2013-12-13 | 1 | -74/+87 |
|\ \
| |/
|/| |
|
| * | add comments | Maximilian Hils | 2013-12-10 | 1 | -1/+18 |
| * | refactor ProxyHandler, remove duplicate code | Maximilian Hils | 2013-12-10 | 1 | -74/+70 |
* | | ignore missing CN in certificates. fixes #169 | Maximilian Hils | 2013-12-12 | 1 | -1/+2 |
* | | store resolved ip addresses, fixes #187 | Maximilian Hils | 2013-12-12 | 1 | -0/+3 |
* | | ensure binary read on windows | Maximilian Hils | 2013-12-10 | 1 | -1/+2 |
|/ |
|
* | remove code duplication in ProxyHandler by unifying read_transparent and read... | Maximilian Hils | 2013-12-09 | 1 | -25/+17 |
* | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-12-08 | 1 | -24/+36 |
|\ |
|
| * | Merge pull request #166 from ghjc/forward-proxy | Aldo Cortesi | 2013-12-08 | 1 | -2/+16 |
| |\ |
|
| | * | Added -F http[s]://server:port option that allows MITM to forward traffic to ... | JC | 2013-08-30 | 1 | -2/+16 |
| * | | Merge pull request #170 from jsoriano/master | Aldo Cortesi | 2013-12-08 | 1 | -20/+17 |
| |\ \ |
|
| | * | | 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 |
| | |/ |
|
| * | | Merge pull request #180 from mitmproxy/add_serverconnection_scripthook | Aldo Cortesi | 2013-12-08 | 1 | -0/+1 |
| |\ \ |
|