aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* clean up config/cmdline, fix bugs, remove cruftMaximilian Hils2015-08-2815-345/+303
|
* Revert "unify SSL version/method handling"Maximilian Hils2015-08-271-25/+44
| | | | This reverts commit 14e49f4fc7a38b63099ab0d42afd213b0d567c0f.
* start fixing proxy configMaximilian Hils2015-08-271-42/+6
|
* fix inline script redirectsMaximilian Hils2015-08-275-34/+45
|
* handle tls server errors more gracefullyMaximilian Hils2015-08-271-3/+17
|
* re-add http1 replayMaximilian Hils2015-08-271-1/+89
|
* re-add --ignore and --tcpMaximilian Hils2015-08-271-27/+39
|
* no more sni double-connects!Maximilian Hils2015-08-272-10/+1
|
* clean up clienthello parsingMaximilian Hils2015-08-2610-1041/+19
|
* fix non-alpn clientsMaximilian Hils2015-08-261-1/+4
|
* http2: fix bugs, chrome works :tada:Maximilian Hils2015-08-263-5/+8
|
* Merge branch 'proxy-refactor-cb' of https://github.com/mitmproxy/mitmproxy ↵Maximilian Hils2015-08-260-0/+0
|\ | | | | | | into proxy-refactor-cb
| * Merge pull request #739 from Kriechi/proxy-refactor-cbMaximilian Hils2015-08-261-0/+1
| |\ | | | | | | fix return value and empty requests
| | * fix return value and empty requestsThomas Kriechbaumer2015-08-261-0/+1
| |/
* / improve alpn handlingMaximilian Hils2015-08-262-11/+24
|/
* manually read tls clienthelloMaximilian Hils2015-08-263-107/+57
|
* manually read tls clienthello [wip]Maximilian Hils2015-08-2611-12/+1316
|
* minor fixesMaximilian Hils2015-08-252-4/+9
|
* request -> request_methodMaximilian Hils2015-08-245-31/+24
|
* fix bugs, fix testsMaximilian Hils2015-08-245-56/+58
|
* adapt netlib changesThomas Kriechbaumer2015-08-214-11/+12
|
* http2: simplify protocol-related codeThomas Kriechbaumer2015-08-201-9/+8
|
* fix typoThomas Kriechbaumer2015-08-201-1/+1
|
* http2: use callback for handle unexpected framesThomas Kriechbaumer2015-08-191-5/+8
|
* Merge pull request #734 from Kriechi/proxy-refactor-cbMaximilian Hils2015-08-191-16/+37
|\ | | | | move read methods to lower HTTP layer
| * move read methods to lower HTTP layerThomas Kriechbaumer2015-08-191-16/+37
|/
* Merge pull request #733 from Kriechi/proxy-refactor-cbMaximilian Hils2015-08-194-54/+52
|\ | | | | Proxy refactor cb
| * move send method to lower layersThomas Kriechbaumer2015-08-191-6/+15
| |
| * improve next_layer detectionThomas Kriechbaumer2015-08-192-13/+20
| |
| * http2: fix connection preface and wrappersThomas Kriechbaumer2015-08-192-35/+17
|/
* yield -> callbacksMaximilian Hils2015-08-1812-205/+156
|
* various fixesMaximilian Hils2015-08-1811-26/+78
|
* Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactorMaximilian Hils2015-08-175-73/+57
|\ | | | | | | | | Conflicts: libmproxy/protocol2/http.py
| * implement Http1 and Http2 protocols as layersThomas Kriechbaumer2015-08-166-70/+54
| |
* | improve protocol handlingMaximilian Hils2015-08-1611-60/+114
|/
* minor fixesMaximilian Hils2015-08-162-2/+3
|
* Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactorMaximilian Hils2015-08-164-16/+29
|\ | | | | | | | | | | | | Conflicts: libmproxy/protocol2/http_proxy.py libmproxy/protocol2/tls.py libmproxy/proxy/connection.py
| * add ALPN to proxy connectionsThomas Kriechbaumer2015-08-164-16/+36
| |
* | minor fixesMaximilian Hils2015-08-163-50/+51
| |
* | Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactorMaximilian Hils2015-08-153-13/+19
|\ \ | |/ |/|
| * add ALPN to proxy connectionsThomas Kriechbaumer2015-08-153-13/+19
| |
* | fix bugs, make https workMaximilian Hils2015-08-156-41/+37
| |
* | various fixesMaximilian Hils2015-08-154-24/+36
|/
* more work on http protocolMaximilian Hils2015-08-146-15/+187
|
* more work on http layerMaximilian Hils2015-08-148-42/+200
|
* wip commitMaximilian Hils2015-08-1112-57/+170
|
* cleaner Exceptions, ssl -> tls, upstream proxy modeMaximilian Hils2015-08-1114-68/+145
|
* add reverseproxy mode, fix bugsMaximilian Hils2015-08-115-15/+35
|
* simplify layer code, add yield_from_callback decoratorMaximilian Hils2015-08-112-40/+69
|
* apply fixes from proxy-refactor-cb branchMaximilian Hils2015-08-117-35/+38
|