kylefang/mitmproxy
1
0
Fork 0
mirror of https://github.com/zhigang1992/mitmproxy.git synced 2026-01-12 22:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • cbc0d3fd41 Merge pull request #1876 from mhils/1858 Maximilian Hils 2016-12-19 15:19:02 +01:00
  • c4e9000021 fix #1858 Maximilian Hils 2016-12-19 01:15:10 +01:00
  • 504c289ad0 Merge pull request #1875 from Kriechi/dont-log-tracebacks Thomas Kriechbaumer 2016-12-17 22:53:05 +01:00
  • 975d1b87a3 fix #1867 (#1873) Maximilian Hils 2016-12-17 18:59:50 +01:00
  • ea62521f03 Merge pull request #1874 from Kriechi/bump-h2 Thomas Kriechbaumer 2016-12-17 18:49:29 +01:00
  • 5cfc728d2e don't log full tracebacks Thomas Kriechbaumer 2016-12-17 18:28:34 +01:00
  • c50feb6a40 bump h2 Thomas Kriechbaumer 2016-12-17 17:59:23 +01:00
  • d4298cd747 Merge pull request #1871 from Kriechi/http2-gui Maximilian Hils 2016-12-17 18:11:36 +01:00
  • ffcf060928 display ALPN information Thomas Kriechbaumer 2016-12-17 13:49:18 +01:00
  • 07671440ba Merge pull request #1872 from mhils/appveyor Thomas Kriechbaumer 2016-12-17 17:25:24 +01:00
  • 377be68cac appveyor: don't build installer for PRs Maximilian Hils 2016-12-17 16:01:44 +01:00
  • 39a251a988 Merge pull request #1870 from Kriechi/http2-timeouts Thomas Kriechbaumer 2016-12-17 10:45:34 +01:00
  • 3eac72f1a3 http2: faster timeouts Thomas Kriechbaumer 2016-12-17 10:34:53 +01:00
  • 85e0e5da4c Compat 0.19 -> 1.0 Aldo Cortesi 2016-12-17 11:01:40 +13:00
  • aa90fd359d Administrivia: docs for new config file, minor adjustments Aldo Cortesi 2016-12-17 10:57:13 +13:00
  • 2fe7cf448d Release administrivia: changelog stub, contributors, bump to v1.0 Aldo Cortesi 2016-12-17 10:35:13 +13:00
  • fc724b6641 Merge pull request #1864 from cortesi/tdocs Aldo Cortesi 2016-12-17 10:29:27 +13:00
  • 007aeef770 Addon test docs, remove stray deprecated events Aldo Cortesi 2016-12-17 10:03:35 +13:00
  • c4929bbc19 Merge pull request #1863 from Kriechi/disable-h2c Aldo Cortesi 2016-12-17 09:19:48 +13:00
  • cf15a3c3ef Merge pull request #1862 from mhils/remove-intercept-events Aldo Cortesi 2016-12-17 09:15:11 +13:00
  • 39a8d4dc22 disable h2c upgrades Thomas Kriechbaumer 2016-12-16 11:28:59 +01:00
  • 388fa7e716 remove intercept events, update view manually Maximilian Hils 2016-12-16 00:13:18 +01:00
  • 6695ce4624 Merge pull request #1861 from cortesi/marking Aldo Cortesi 2016-12-16 17:26:19 +13:00
  • e769b1fa9a Merge pull request #1860 from cortesi/smokey Maximilian Hils 2016-12-16 00:16:34 +01:00
  • e387c68b38 console: mark view indiciator, fix empty flow list behaviour Aldo Cortesi 2016-12-16 11:47:59 +13:00
  • 61e552553c Catch occasional protocol errors in regular connect Aldo Cortesi 2016-12-16 10:54:36 +13:00
  • 6b5673e849 Merge pull request #1845 from mhils/mitmweb-improvements Aldo Cortesi 2016-12-16 10:04:12 +13:00
  • 78c78ce651 Merge pull request #1857 from mitmproxy/bump-cryptography Thomas Kriechbaumer 2016-12-14 19:38:53 +01:00
  • 1d846709c6 update dependencies Maximilian Hils 2016-12-14 18:19:49 +01:00
  • 727abdba44 Merge pull request #1852 from mhils/simplenamespace Maximilian Hils 2016-12-13 15:06:14 +01:00
  • e2c6d7ed0f Merge pull request #1851 from mhils/1850 Maximilian Hils 2016-12-13 14:41:04 +01:00
  • 44f94c8844 use types.SimpleNamespace instead of custom NS class Maximilian Hils 2016-12-13 14:09:06 +01:00
  • e5b3c8bed3 fix #1850 Maximilian Hils 2016-12-13 14:03:00 +01:00
  • b39380b00f console: respect follow in eventlog Doug Freed 2016-12-04 18:08:12 +00:00
  • 48b6964552 console: increase eventlog size limit to 10000 Doug Freed 2016-12-12 14:20:40 +00:00
  • 5cf268b012 Merge pull request #1842 from cortesi/optsave Aldo Cortesi 2016-12-12 12:53:26 +13:00
  • 5e2a80fba1 Minor fixes Aldo Cortesi 2016-12-12 12:18:33 +13:00
  • d854e08653 [web] various fixes Maximilian Hils 2016-12-11 22:52:17 +01:00
  • a4ac5b158f Merge branch 'master' into optsave Aldo Cortesi 2016-12-12 11:13:32 +13:00
  • 980a84326b InstallBuilder (#1826) Maximilian Hils 2016-12-11 23:07:47 +01:00
  • 6dcd620c4a Merge pull request #1838 from mhils/http2-is-difficult Aldo Cortesi 2016-12-12 09:17:06 +13:00
  • a99bf0814c console: clean path prompt handling Aldo Cortesi 2016-12-12 09:06:18 +13:00
  • a7d7ad2880 Merge pull request #1837 from mhils/1809 Maximilian Hils 2016-12-11 21:13:20 +01:00
  • d1c7b203f0 [web] style flow menu Maximilian Hils 2016-12-11 19:59:54 +01:00
  • f8032bf85a Replacements and SetHeaders are both defined as text in Options Aldo Cortesi 2016-12-11 22:08:41 +13:00
  • ca33bea296 Extend type checker validate Sequence specs Aldo Cortesi 2016-12-11 17:04:19 +13:00
  • c5717b17df console: add saving of config file Aldo Cortesi 2016-12-10 08:28:20 +13:00
  • 6540aedaab [web] style start menu Maximilian Hils 2016-12-11 18:49:28 +01:00
  • f16aab963e Merge pull request #1841 from mitmproxy/fix-docs-tests Maximilian Hils 2016-12-11 18:15:00 +01:00
  • 00ae4d3f6e fix version sourcing in setup.py Maximilian Hils 2016-12-11 17:50:46 +01:00
  • 8f04225450 fix install.rst Maximilian Hils 2016-12-11 17:49:07 +01:00
  • 795e76eee2 [web] style options menu Maximilian Hils 2016-12-11 17:37:11 +01:00
  • b92980efec [web] show proxy address, add websocket toggle Maximilian Hils 2016-12-11 15:26:49 +01:00
  • 21eeaebc6b pin docutils version to fix docs tests Maximilian Hils 2016-12-11 14:54:12 +01:00
  • b62b92eabe Merge pull request #1840 from mhils/1829 Maximilian Hils 2016-12-11 14:50:20 +01:00
  • 610433f204 Merge pull request #1839 from mhils/1830 Maximilian Hils 2016-12-11 14:50:13 +01:00
  • bdba885922 fix #1829 Maximilian Hils 2016-12-11 13:22:26 +01:00
  • 265ab7bf26 fix #1830 Maximilian Hils 2016-12-11 13:11:02 +01:00
  • 4023327087 Merge pull request #1836 from Kriechi/wipeout-lxml Maximilian Hils 2016-12-11 13:03:24 +01:00
  • 81b5788dfc docs: update installation Thomas Kriechbaumer 2016-12-10 20:44:27 +01:00
  • 9139d55293 Merge pull request #1835 from Kriechi/bump Maximilian Hils 2016-12-11 00:31:35 +01:00
  • b24d9654a9 disable http2 by default, add explicit on/off switches Maximilian Hils 2016-12-11 00:26:01 +01:00
  • 782c66eac2 fix #1809 Maximilian Hils 2016-12-10 21:36:31 +01:00
  • 036130868d bump dependencies Thomas Kriechbaumer 2016-12-10 17:06:49 +01:00
  • 8112bce424 Merge pull request #1831 from mhils/contentviews Aldo Cortesi 2016-12-11 07:33:27 +13:00
  • b4a1bb44d9 minor fixes Maximilian Hils 2016-12-10 17:17:58 +01:00
  • 8df61c927e Merge pull request #1834 from Kriechi/remove_ssl_match_hostname Maximilian Hils 2016-12-10 17:03:18 +01:00
  • 7bae941ecc remove backport.ssl_match_hostname Thomas Kriechbaumer 2016-12-10 14:29:48 +01:00
  • 3e37cbd061 minor fixes Maximilian Hils 2016-12-10 12:06:33 +01:00
  • 123ef043dc add new xml/html pretty-printer 🎉 Maximilian Hils 2016-12-10 11:36:32 +01:00
  • 293b79af91 remove lxml-dependent code Maximilian Hils 2016-12-10 10:19:05 +01:00
  • a7ba2f7b46 update tests, increase coverage, add type info Maximilian Hils 2016-12-09 21:26:02 +01:00
  • f53f079f91 split contentviews.py into mitmproxy.contentviews Maximilian Hils 2016-12-09 19:02:55 +01:00
  • d1c72574d5 Merge pull request #1827 from mhils/issue-1803 Maximilian Hils 2016-12-09 18:32:58 +01:00
  • f0e9e4bab9 fix #1803 Maximilian Hils 2016-12-09 17:18:26 +01:00
  • 6792cc1de9 Merge pull request #1823 from cortesi/options2 Aldo Cortesi 2016-12-08 19:23:02 +13:00
  • e943147fc3 options: add a merge method to assimilate options Aldo Cortesi 2016-12-08 16:12:40 +13:00
  • fdd1e23875 Merge pull request #1822 from cortesi/clog Aldo Cortesi 2016-12-08 13:42:14 +13:00
  • 67e9de5f7f console: use an addon to capture logs Aldo Cortesi 2016-12-08 10:47:45 +13:00
  • 0a68613c8c Merge pull request #1806 from cortesi/options Aldo Cortesi 2016-12-08 10:45:23 +13:00
  • b2695dbc6a Minor tweaks Aldo Cortesi 2016-12-08 10:18:50 +13:00
  • a617e3b5f7 Amalgamate all the Options objects Aldo Cortesi 2016-12-05 17:49:16 +13:00
  • d742d4fb8c Replace configargparse with argparse, enable new options loading Aldo Cortesi 2016-12-05 15:55:43 +13:00
  • 6aacd27ab2 Add YAML serialization of options Aldo Cortesi 2016-12-05 07:18:53 +13:00
  • 150372e297 options: defaults are a class attribute Aldo Cortesi 2016-12-03 12:16:50 +13:00
  • 2cb1f70381 Options - avoid mutation, API cleanup, has_changed Aldo Cortesi 2016-12-03 09:42:14 +13:00
  • 00c897a185 options: save defaults, add .reset() to restore defaults Aldo Cortesi 2016-12-02 16:15:14 +13:00
  • d74cac265a Add YAML serialization of options Aldo Cortesi 2016-12-05 07:18:53 +13:00
  • c94cd512d1 options: defaults are a class attribute Aldo Cortesi 2016-12-03 12:16:50 +13:00
  • 3594faf5c4 Correct refresh_server_playback option default Aldo Cortesi 2016-12-03 11:56:50 +13:00
  • c062e302e9 Add OptManager.subscribe, use it to clean up palettes in console Aldo Cortesi 2016-12-03 11:54:04 +13:00
  • 0c091bd92b Options - avoid mutation, API cleanup, has_changed Aldo Cortesi 2016-12-03 09:42:14 +13:00
  • b231836c70 Get rid of tfile testing option Aldo Cortesi 2016-12-03 09:20:27 +13:00
  • 297493801d Clean up dump tests Aldo Cortesi 2016-12-03 09:00:55 +13:00
  • b4d33aaebf options: save defaults, add .reset() to restore defaults Aldo Cortesi 2016-12-02 16:15:14 +13:00
  • 4771abf229 Merge pull request #1817 from Kriechi/fix-1816 Thomas Kriechbaumer 2016-12-06 19:52:12 +01:00
  • 47196e8676 tls_parser: allow optional extensions Thomas Kriechbaumer 2016-12-05 10:09:32 +01:00
  • e44493bda5 Merge pull request #1810 from Kriechi/construct Maximilian Hils 2016-12-04 18:43:20 +01:00
  • 1fc1a17c61 Merge pull request #1813 from dwfreed/patch-1 Maximilian Hils 2016-12-04 18:43:02 +01:00
  • 306431f0b8 release: fix dropping _main suffix Doug Freed 2016-12-04 17:41:31 +00:00