aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy.py
Commit message (Expand)AuthorAgeFilesLines
* complete state handlingMaximilian Hils2014-01-301-4/+12
* add generic TCP handler with SSL support, move StateObject into netlibMaximilian Hils2014-01-301-36/+40
* remove old classesMaximilian Hils2014-01-301-0/+8
* merge flow classes. current status: basic mitmdump workingMaximilian Hils2014-01-301-7/+22
* fix most testsuite errors, improve proxy error handlingMaximilian Hils2014-01-291-11/+17
* unify ipv4/ipv6 address handlingMaximilian Hils2014-01-281-28/+21
* merge masterMaximilian Hils2014-01-221-1/+0
|\
| * Silence pyflakesAldo Cortesi2014-01-191-9/+6
| * fix sni bug: respond with the correct certificateMaximilian Hils2014-01-161-5/+5
| * Start refactoring scriptsAldo Cortesi2014-01-121-3/+3
* | Add functionality to transparently proxify connections to other HTTPS proxiesMaximilian Hils2014-01-181-2/+2
* | get server reconnect right, fix timestampsMaximilian Hils2014-01-181-32/+43
* | small refactorings, bugs fixedMaximilian Hils2014-01-181-4/+10
* | add basic error handlingMaximilian Hils2014-01-131-10/+2
* | fix header assembly, other improvementsMaximilian Hils2014-01-101-3/+7
* | improve https handlingMaximilian Hils2014-01-091-16/+27
* | groundwork completedMaximilian Hils2014-01-091-63/+105
* | continue work on the proxyhandlerMaximilian Hils2014-01-071-91/+62
|\|
| * Merge pull request #192 from mitmproxy/refactor_read_http_bodyAldo Cortesi2014-01-041-4/+14
| |\
| | * move CONTINUE checks into mitmproxyMaximilian Hils2013-12-151-4/+14
| * | Introduce file descriptor decorators for Request objectsAldo Cortesi2014-01-051-4/+11
| * | Decouple message type from message class name.Aldo Cortesi2014-01-041-10/+10
| * | Move app mechanism to flow.pyAldo Cortesi2014-01-041-96/+66
* | | first steps on tcp proxyingMaximilian Hils2014-01-051-357/+91
|/ /
* | merge smurfix/fix2, add serverconnect hook docs, adjust testsMaximilian Hils2013-12-161-3/+17
|\ \ | |/ |/|
| * 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
* | 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
* | ignore missing CN in certificates. fixes #169Maximilian Hils2013-12-121-1/+2
* | store resolved ip addresses, fixes #187Maximilian Hils2013-12-121-0/+3
* | ensure binary read on windowsMaximilian Hils2013-12-101-1/+2
|/
* remove code duplication in ProxyHandler by unifying read_transparent and read...Maximilian Hils2013-12-091-25/+17
* Merge branch 'master' into 0.10Maximilian Hils2013-12-081-24/+36
|\
| * Merge pull request #166 from ghjc/forward-proxyAldo Cortesi2013-12-081-2/+16
| |\
| | * Added -F http[s]://server:port option that allows MITM to forward traffic to ...JC2013-08-301-2/+16
| * | 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-081-0/+1
| |\ \
| | * | add serverconnect script hookMaximilian Hils2013-11-181-0/+1
| | |/
| * / attempt to fix https://github.com/mitmproxy/netlib/issues/24Maximilian Hils2013-11-191-2/+2
| |/
* | Merge branch 'master' into 0.10Maximilian Hils2013-09-141-2/+5
|\|
| * Tweak timing displayAldo Cortesi2013-08-231-2/+5
* | Merge branch 'master' into 0.10Maximilian Hils2013-08-171-55/+15
|\|
| * 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-011-14/+0