aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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
| |
| * minor fixesMaximilian Hils2015-08-114-8/+7
| |
| * add auto layer, multiple other fixesMaximilian Hils2015-08-116-165/+183
| |
| * move files aroundMaximilian Hils2015-08-118-196/+215
| |
| * add ssl layerMaximilian Hils2015-08-113-14/+247
| |
| * first initial proof-of-conceptMaximilian Hils2015-08-113-8/+282
|/
* Merge pull request #720 from Kriechi/cleanupMaximilian Hils2015-08-116-122/+9
|\ | | | | move code to netlib
| * move code to netlibThomas Kriechbaumer2015-08-106-122/+9
|/
* dev script: fix Linux+vagrant+virtualenvMaximilian Hils2015-08-071-1/+1
|
* dev script: fix Windows+vagrant+virtualenvMaximilian Hils2015-08-071-1/+1
|
* remove evil unicode_literalsMaximilian Hils2015-08-061-1/+1
|
* fix #705Maximilian Hils2015-08-031-4/+8
|
* fix testsThomas Kriechbaumer2015-08-022-7/+15
|
* fix imports for encodingThomas Kriechbaumer2015-08-014-7/+9
|
* move encoding tests from mitmproxy to netlibThomas Kriechbaumer2015-08-011-33/+0
|
* reimplement streaming for HTTP/1Thomas Kriechbaumer2015-08-013-59/+59
|
* revert hard-coded HTTP/2 protocol changesThomas Kriechbaumer2015-08-011-7/+8
|
* move code from mitmproxy to netlibThomas Kriechbaumer2015-08-0115-779/+134
|
* revert ALPN-related changes to fix masterThomas Kriechbaumer2015-08-011-9/+11
| | | | | In the future this should be added again to support HTTP/2.
* Merge pull request #698 from Kriechi/http2-wipAldo Cortesi2015-08-0117-1105/+943
|\ | | | | [WIP] Protocol Refactoring for HTTP/2
| * attach application protocol to connectionThomas Kriechbaumer2015-07-305-46/+67
| |
| * move code to netlib and implement protocolsThomas Kriechbaumer2015-07-3015-296/+132
| |
| * refactor connection & protocol handlingThomas Kriechbaumer2015-07-304-925/+906
| |
* | Merge pull request #699 from onlywade/bugfix/docs_update_shortcut_keysMaximilian Hils2015-07-307-21/+24
|\ \ | |/ |/| Update docs to reflect current shortcut keys for features which have …
| * Update docs to reflect current shortcut keys for features which have been ↵Wade Catron2015-07-297-21/+24
|/ | | | moved into the options menu.
* Merge pull request #548 from macmantrl/no_serverconnMaximilian Hils2015-07-264-4/+21
|\ | | | | Prevent unnecessary upstream server connects
| * Prevent unecessary upstream server connectsTerry Long2015-07-034-4/+21
| | | | | | | | | | | | Selectively connect to upstream server based on no_upstream_cert option. When no_upstream_cert is used during server replay, prevent connecting to the upstream server unless absolutely necessary.
* | Bump version for devAldo Cortesi2015-07-261-1/+1
| |
* | Changelog for v0.13Aldo Cortesi2015-07-261-0/+30
| |
* | fix module importsThomas Kriechbaumer2015-07-251-8/+8
| |