Commit Graph

2209 Commits

Author SHA1 Message Date
Maximilian Hils e88c7e4c58 Merge branch 'master' into readthedocs 2015-09-04 00:47:04 +02:00
Maximilian Hils ee8e5947df Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2015-09-04 00:46:51 +02:00
Maximilian Hils a18db90ea3 update example inline scripts 2015-09-04 00:46:42 +02:00
Maximilian Hils 2d1c382f38 docs, docs, docs! 2015-09-04 00:45:47 +02:00
Thomas Kriechbaumer 47ab7f04ea http2: Ping frames are handled in netlib 2015-09-03 21:23:19 +02:00
Maximilian Hils 29698aa83c add dev docs 2015-09-03 19:46:58 +02:00
Maximilian Hils 14457f29b3 docs++ 2015-09-03 18:55:38 +02:00
Maximilian Hils 99126f62ed remove depth attribute from set_server 2015-09-03 18:25:36 +02:00
Maximilian Hils 8da683a638 Merge branch 'master' of https://github.com/mitmproxy/mitmproxy 2015-09-03 17:01:37 +02:00
Maximilian Hils f4272de5ec remove ServerConnectionMixin.reconnect 2015-09-03 17:01:25 +02:00
Thomas Kriechbaumer 3a229f60e3 http2: fix ping response 2015-09-03 14:26:36 +02:00
Thomas Kriechbaumer 1f6d05f89f http2: server can send WindowUpdate frames as well 2015-09-03 14:09:59 +02:00
Thomas Kriechbaumer bc93600a66 http2: add GoAway support for client 2015-09-03 13:55:13 +02:00
Thomas Kriechbaumer b4d6f2e12b http2: fix PingFrame again 2015-09-03 13:55:13 +02:00
Thomas Kriechbaumer 29ae2bbf91 http2: fix multiple stream per connection
fixes #746
2015-09-03 13:54:58 +02:00
Thomas Kriechbaumer bde4bdd1d2 http2: fix unhandled frames 2015-09-03 13:40:35 +02:00
Maximilian Hils a0f3803233 Merge pull request #748 from Kriechi/tls-ciphers
pass-through ciphers from client to server
2015-09-03 12:57:56 +02:00
Maximilian Hils 7a1e2789a8 Merge pull request #749 from Kriechi/ignore-priority-frames
ignore http2 priority frames
2015-09-03 12:54:54 +02:00
Thomas Kriechbaumer 37e6b3c401 http2: improve unexpected frame handling and shutdown 2015-09-03 11:09:59 +02:00
Thomas Kriechbaumer c79af62763 ignore http2 priority frames 2015-09-02 20:50:50 +02:00
Thomas Kriechbaumer 0047ac4cdc pass-through ciphers from client to server 2015-09-02 20:46:14 +02:00
Maximilian Hils c14fbc7794 Merge pull request #741 from mitmproxy/proxy-refactor-cb
Proxy Refactor
2015-09-02 01:16:48 +02:00
Maximilian Hils f1c8b47b1e better tls error messages, fix #672 2015-09-01 19:24:36 +02:00
Maximilian Hils 2f0d650729 Merge branch 'master' into proxy-refactor-cb 2015-09-01 02:39:59 +02:00
Maximilian Hils 6719aa5986 Merge branch 'proxy-refactor-cb' of https://github.com/mitmproxy/mitmproxy into proxy-refactor-cb 2015-09-01 02:39:57 +02:00
Maximilian Hils e8de7595c2 .env: fix windows compatibility 2015-09-01 02:37:03 +02:00
Maximilian Hils b5f1c38e78 minor docs improvements 2015-09-01 02:35:05 +02:00
Maximilian Hils de10b3f7ec Merge pull request #744 from Kriechi/proxy-refactor-cb
do not log WindowUpdateFrame frames
2015-08-31 23:20:30 +02:00
Thomas Kriechbaumer c4d6b35726 do not log WindowUpdateFrame frames 2015-08-31 22:22:10 +02:00
Maximilian Hils 481cc6ea84 we don't support socks auth, refs #738 2015-08-31 17:29:14 +02:00
Maximilian Hils b04e6e56ab update inline script hooks 2015-08-31 17:05:52 +02:00
Maximilian Hils 41e6e538df fix layer initialization 2015-08-31 13:49:47 +02:00
Maximilian Hils 7450bef615 fix dns_spoofing example, avoid connecting to itself 2015-08-31 13:43:30 +02:00
Maximilian Hils 1e9aef5b1e fix upstream proxy server change, update example 2015-08-31 00:14:42 +02:00
Maximilian Hils 63ad4a4f51 coverage++ 2015-08-30 15:59:50 +02:00
Maximilian Hils a86ec56012 move files around 2015-08-30 15:27:29 +02:00
Maximilian Hils 421b241ff0 remove http2http references 2015-08-30 13:40:23 +02:00
Maximilian Hils 3873e08339 remove old code 2015-08-30 03:42:11 +02:00
Maximilian Hils 08655cb956 Merge remote-tracking branch 'origin/master' into proxy-refactor-cb 2015-08-30 03:24:05 +02:00
Maximilian Hils 21e7f420d2 minor fixes 2015-08-30 03:23:57 +02:00
Maximilian Hils 1dd09a5509 always insert tls layer for inline script upgrades 2015-08-30 02:27:38 +02:00
Maximilian Hils dd7f50d64b restructure code, remove cruft 2015-08-30 01:21:58 +02:00
Maximilian Hils 100ea27c30 simplify raw tcp protocol 2015-08-29 23:08:16 +02:00
Maximilian Hils a7058e2a3c fix bugs, fix tests 2015-08-29 20:53:25 +02:00
Maximilian Hils 63844df343 fix streaming 2015-08-29 14:28:11 +02:00
Maximilian Hils 2dfba2105b move sslversion mapping to netlib 2015-08-29 12:34:01 +02:00
Maximilian Hils 1cc48345e1 clean up config/cmdline, fix bugs, remove cruft 2015-08-28 01:51:13 +02:00
Maximilian Hils a86491eeed Revert "unify SSL version/method handling"
This reverts commit 14e49f4fc7.
2015-08-27 18:37:16 +02:00
Maximilian Hils 5b17496c7e start fixing proxy config 2015-08-27 18:31:15 +02:00
Maximilian Hils 83decd6771 fix inline script redirects 2015-08-27 17:35:53 +02:00