Commit Graph

22 Commits

Author SHA1 Message Date
Maximilian Hils 96de7ad562 various fixes 2015-08-18 14:15:08 +02:00
Maximilian Hils 99129ab5a1 Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor
Conflicts:
	libmproxy/protocol2/http.py
2015-08-17 19:20:28 +02:00
Maximilian Hils a2b8504889 improve protocol handling 2015-08-16 23:25:02 +02:00
Thomas Kriechbaumer 38c456bb62 implement Http1 and Http2 protocols as layers 2015-08-16 15:19:11 +02:00
Maximilian Hils c04fa1b233 minor fixes 2015-08-16 12:52:34 +02:00
Maximilian Hils 61afac8637 Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor
Conflicts:
	libmproxy/protocol2/http_proxy.py
	libmproxy/protocol2/tls.py
	libmproxy/proxy/connection.py
2015-08-16 12:47:13 +02:00
Maximilian Hils 4c31ffd90f minor fixes 2015-08-16 12:43:15 +02:00
Thomas Kriechbaumer 1e40d34e94 add ALPN to proxy connections 2015-08-16 11:36:31 +02:00
Maximilian Hils a175572447 Merge remote-tracking branch 'Kriechi/proxy-refactor' into proxy-refactor 2015-08-15 20:22:45 +02:00
Maximilian Hils 2a15479cdb fix bugs, make https work 2015-08-15 20:20:46 +02:00
Thomas Kriechbaumer a9dd82c986 add ALPN to proxy connections 2015-08-15 17:49:40 +02:00
Maximilian Hils 0dd243c5e4 various fixes 2015-08-15 16:26:12 +02:00
Maximilian Hils 747699b126 more work on http protocol 2015-08-14 16:49:52 +02:00
Maximilian Hils 808218f4bc more work on http layer 2015-08-14 10:41:11 +02:00
Maximilian Hils aef3b626a7 wip commit 2015-08-11 20:32:14 +02:00
Maximilian Hils 026330a3b0 cleaner Exceptions, ssl -> tls, upstream proxy mode 2015-08-11 20:32:13 +02:00
Maximilian Hils 314e0f5839 add reverseproxy mode, fix bugs 2015-08-11 20:32:12 +02:00
Maximilian Hils aac0ab23eb simplify layer code, add yield_from_callback decorator 2015-08-11 20:32:12 +02:00
Maximilian Hils c46e3f90bb apply fixes from proxy-refactor-cb branch 2015-08-11 20:32:11 +02:00
Maximilian Hils 531ca4a356 minor fixes 2015-08-11 20:32:10 +02:00
Maximilian Hils e815915b22 add auto layer, multiple other fixes 2015-08-11 20:32:10 +02:00
Maximilian Hils c1d016823c move files around 2015-08-11 20:32:09 +02:00