Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | http2: fix connection preface and wrappers | Thomas Kriechbaumer | 2015-08-19 | 2 | -35/+17 | |
| |/ | ||||||
| * | yield -> callbacks | Maximilian Hils | 2015-08-18 | 12 | -205/+156 | |
| | | ||||||
| * | various fixes | Maximilian Hils | 2015-08-18 | 11 | -26/+78 | |
| | | ||||||
| * | Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor | Maximilian Hils | 2015-08-17 | 5 | -73/+57 | |
| |\ | | | | | | | | | | | | | Conflicts: libmproxy/protocol2/http.py | |||||
| | * | implement Http1 and Http2 protocols as layers | Thomas Kriechbaumer | 2015-08-16 | 6 | -70/+54 | |
| | | | ||||||
| * | | improve protocol handling | Maximilian Hils | 2015-08-16 | 11 | -60/+114 | |
| |/ | ||||||
| * | minor fixes | Maximilian Hils | 2015-08-16 | 2 | -2/+3 | |
| | | ||||||
| * | Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor | Maximilian Hils | 2015-08-16 | 4 | -16/+29 | |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: libmproxy/protocol2/http_proxy.py libmproxy/protocol2/tls.py libmproxy/proxy/connection.py | |||||
| | * | add ALPN to proxy connections | Thomas Kriechbaumer | 2015-08-16 | 4 | -16/+36 | |
| | | | ||||||
| * | | minor fixes | Maximilian Hils | 2015-08-16 | 3 | -50/+51 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor | Maximilian Hils | 2015-08-15 | 3 | -13/+19 | |
| |\ \ | | |/ | |/| | ||||||
| | * | add ALPN to proxy connections | Thomas Kriechbaumer | 2015-08-15 | 3 | -13/+19 | |
| | | | ||||||
| * | | fix bugs, make https work | Maximilian Hils | 2015-08-15 | 6 | -41/+37 | |
| | | | ||||||
| * | | various fixes | Maximilian Hils | 2015-08-15 | 4 | -24/+36 | |
| |/ | ||||||
| * | more work on http protocol | Maximilian Hils | 2015-08-14 | 6 | -15/+187 | |
| | | ||||||
| * | more work on http layer | Maximilian Hils | 2015-08-14 | 8 | -42/+200 | |
| | | ||||||
| * | wip commit | Maximilian Hils | 2015-08-11 | 12 | -57/+170 | |
| | | ||||||
| * | cleaner Exceptions, ssl -> tls, upstream proxy mode | Maximilian Hils | 2015-08-11 | 14 | -68/+145 | |
| | | ||||||
| * | add reverseproxy mode, fix bugs | Maximilian Hils | 2015-08-11 | 5 | -15/+35 | |
| | | ||||||
| * | simplify layer code, add yield_from_callback decorator | Maximilian Hils | 2015-08-11 | 2 | -40/+69 | |
| | | ||||||
| * | apply fixes from proxy-refactor-cb branch | Maximilian Hils | 2015-08-11 | 7 | -35/+38 | |
| | | ||||||
| * | minor fixes | Maximilian Hils | 2015-08-11 | 4 | -8/+7 | |
| | | ||||||
| * | add auto layer, multiple other fixes | Maximilian Hils | 2015-08-11 | 6 | -165/+183 | |
| | | ||||||
| * | move files around | Maximilian Hils | 2015-08-11 | 8 | -196/+215 | |
| | | ||||||
| * | add ssl layer | Maximilian Hils | 2015-08-11 | 3 | -14/+247 | |
| | | ||||||
| * | first initial proof-of-concept | Maximilian Hils | 2015-08-11 | 3 | -8/+282 | |
|/ | ||||||
* | Merge pull request #720 from Kriechi/cleanup | Maximilian Hils | 2015-08-11 | 6 | -122/+9 | |
|\ | | | | | move code to netlib | |||||
| * | move code to netlib | Thomas Kriechbaumer | 2015-08-10 | 6 | -122/+9 | |
|/ | ||||||
* | dev script: fix Linux+vagrant+virtualenv | Maximilian Hils | 2015-08-07 | 1 | -1/+1 | |
| | ||||||
* | dev script: fix Windows+vagrant+virtualenv | Maximilian Hils | 2015-08-07 | 1 | -1/+1 | |
| | ||||||
* | remove evil unicode_literals | Maximilian Hils | 2015-08-06 | 1 | -1/+1 | |
| | ||||||
* | fix #705 | Maximilian Hils | 2015-08-03 | 1 | -4/+8 | |
| | ||||||
* | fix tests | Thomas Kriechbaumer | 2015-08-02 | 2 | -7/+15 | |
| | ||||||
* | fix imports for encoding | Thomas Kriechbaumer | 2015-08-01 | 4 | -7/+9 | |
| | ||||||
* | move encoding tests from mitmproxy to netlib | Thomas Kriechbaumer | 2015-08-01 | 1 | -33/+0 | |
| | ||||||
* | reimplement streaming for HTTP/1 | Thomas Kriechbaumer | 2015-08-01 | 3 | -59/+59 | |
| | ||||||
* | revert hard-coded HTTP/2 protocol changes | Thomas Kriechbaumer | 2015-08-01 | 1 | -7/+8 | |
| | ||||||
* | move code from mitmproxy to netlib | Thomas Kriechbaumer | 2015-08-01 | 15 | -779/+134 | |
| | ||||||
* | revert ALPN-related changes to fix master | Thomas Kriechbaumer | 2015-08-01 | 1 | -9/+11 | |
| | | | | | In the future this should be added again to support HTTP/2. | |||||
* | Merge pull request #698 from Kriechi/http2-wip | Aldo Cortesi | 2015-08-01 | 17 | -1105/+943 | |
|\ | | | | | [WIP] Protocol Refactoring for HTTP/2 | |||||
| * | attach application protocol to connection | Thomas Kriechbaumer | 2015-07-30 | 5 | -46/+67 | |
| | | ||||||
| * | move code to netlib and implement protocols | Thomas Kriechbaumer | 2015-07-30 | 15 | -296/+132 | |
| | | ||||||
| * | refactor connection & protocol handling | Thomas Kriechbaumer | 2015-07-30 | 4 | -925/+906 | |
| | | ||||||
* | | Merge pull request #699 from onlywade/bugfix/docs_update_shortcut_keys | Maximilian Hils | 2015-07-30 | 7 | -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 Catron | 2015-07-29 | 7 | -21/+24 | |
|/ | | | | moved into the options menu. | |||||
* | Merge pull request #548 from macmantrl/no_serverconn | Maximilian Hils | 2015-07-26 | 4 | -4/+21 | |
|\ | | | | | Prevent unnecessary upstream server connects | |||||
| * | Prevent unecessary upstream server connects | Terry Long | 2015-07-03 | 4 | -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 dev | Aldo Cortesi | 2015-07-26 | 1 | -1/+1 | |
| | | ||||||
* | | Changelog for v0.13 | Aldo Cortesi | 2015-07-26 | 1 | -0/+30 | |
| | | ||||||
* | | fix module imports | Thomas Kriechbaumer | 2015-07-25 | 1 | -8/+8 | |
| | |