aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/proxy.py
Commit message (Expand)AuthorAgeFilesLines
* Start refactoring scriptsAldo Cortesi2014-01-121-3/+3
* 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
* | 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
| * Make use of a change to netlib.tcp that clarifies error conditions for flush ...Aldo Cortesi2013-07-301-5/+2
| * fix #144Maximilian Hils2013-07-281-1/+1
| * Terminate can be called on an unconnected server connection.Aldo Cortesi2013-07-281-8/+9
| * Properly terminate SSL server connections.Aldo Cortesi2013-07-281-1/+3
| * Move app instantiation out of proxy.py.Aldo Cortesi2013-07-241-17/+2
| * Don't take minor version into account when checking serialized data compatibl...Aldo Cortesi2013-07-131-1/+1
| * proxy.py: Catch channel.ask() returning None when terminatingMatthias Urlichs2013-06-281-1/+1
| * Close connection when flush failsMatthias Urlichs2013-06-261-0/+3
* | fix send_error behavior if there are no headersMaximilian Hils2013-06-171-2/+3
|/
* Merge pull request #107 from rouli/masterAldo Cortesi2013-04-191-0/+8
|\
| * adding tcp and ssl setup timestamps to get better resolution on flows perform...Rouli2013-03-191-0/+8
* | Add a basic built-in web app.Aldo Cortesi2013-03-251-3/+19
* | Trim docs.Aldo Cortesi2013-03-231-0/+2
|/
* Fix bug that caused mis-identification of some HTTPS connections in transpare...Aldo Cortesi2013-03-171-10/+11
* Fuzzing, and fixes for errors found with fuzzing.Aldo Cortesi2013-03-031-1/+2
* 100% unit test coverage on proxy.py. Hallelujah!Aldo Cortesi2013-03-031-5/+2
* Unit test proxy option parsing.Aldo Cortesi2013-03-031-11/+11
* Move HTTP auth module to netlib.Aldo Cortesi2013-03-031-7/+6