Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rename logging.py example. this conflicted with Python's stdlib | Maximilian Hils | 2016-12-19 | 2 | -2/+2 |
| | |||||
* | Merge pull request #1876 from mhils/1858 | Maximilian Hils | 2016-12-19 | 5 | -20/+29 |
|\ | | | | | fix #1858 | ||||
| * | fix #1858 | Maximilian Hils | 2016-12-19 | 5 | -20/+29 |
| | | |||||
* | | Merge pull request #1875 from Kriechi/dont-log-tracebacks | Thomas Kriechbaumer | 2016-12-17 | 3 | -9/+3 |
|\ \ | | | | | | | don't log full tracebacks | ||||
| * | | don't log full tracebacks | Thomas Kriechbaumer | 2016-12-17 | 3 | -9/+3 |
| | | | |||||
* | | | fix #1867 (#1873) | Maximilian Hils | 2016-12-17 | 1 | -2/+1 |
| | | | |||||
* | | | Merge pull request #1874 from Kriechi/bump-h2 | Thomas Kriechbaumer | 2016-12-17 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | bump h2 | ||||
| * | | bump h2 | Thomas Kriechbaumer | 2016-12-17 | 1 | -1/+1 |
|/ / | | | | | | | This takes care of https://github.com/python-hyper/hyper-h2/issues/422 | ||||
* | | Merge pull request #1871 from Kriechi/http2-gui | Maximilian Hils | 2016-12-17 | 4 | -3/+23 |
|\ \ | | | | | | | display ALPN information | ||||
| * | | display ALPN information | Thomas Kriechbaumer | 2016-12-17 | 4 | -3/+23 |
| | | | |||||
* | | | Merge pull request #1872 from mhils/appveyor | Thomas Kriechbaumer | 2016-12-17 | 1 | -1/+1 |
|\ \ \ | |/ / |/| / | |/ | appveyor: don't build installer for PRs | ||||
| * | appveyor: don't build installer for PRs | Maximilian Hils | 2016-12-17 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1870 from Kriechi/http2-timeouts | Thomas Kriechbaumer | 2016-12-17 | 1 | -2/+2 |
|\ \ | |/ |/| | http2: faster timeouts | ||||
| * | http2: faster timeouts | Thomas Kriechbaumer | 2016-12-17 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #1864 from cortesi/tdocs | Aldo Cortesi | 2016-12-17 | 2 | -3/+17 |
|\ \ | |/ |/| | Addon test docs, remove stray deprecated events | ||||
| * | Addon test docs, remove stray deprecated events | Aldo Cortesi | 2016-12-17 | 2 | -3/+17 |
|/ | | | | Fixes #1572 | ||||
* | Merge pull request #1863 from Kriechi/disable-h2c | Aldo Cortesi | 2016-12-17 | 2 | -0/+23 |
|\ | | | | | disable h2c upgrades | ||||
| * | disable h2c upgrades | Thomas Kriechbaumer | 2016-12-16 | 2 | -0/+23 |
| | | |||||
* | | Merge pull request #1862 from mhils/remove-intercept-events | Aldo Cortesi | 2016-12-17 | 8 | -34/+33 |
|\ \ | | | | | | | Remove intercept events, update view manually | ||||
| * | | remove intercept events, update view manually | Maximilian Hils | 2016-12-16 | 8 | -34/+33 |
| | | | |||||
* | | | Merge pull request #1861 from cortesi/marking | Aldo Cortesi | 2016-12-16 | 3 | -3/+12 |
|\ \ \ | |_|/ |/| | | console: mark view indiciator, fix empty flow list behaviour | ||||
| * | | console: mark view indiciator, fix empty flow list behaviour | Aldo Cortesi | 2016-12-16 | 3 | -3/+12 |
| |/ | | | | | | | Fixes #1782 | ||||
* | | Merge pull request #1860 from cortesi/smokey | Maximilian Hils | 2016-12-16 | 1 | -11/+11 |
|\ \ | |/ |/| | Catch occasional protocol errors in regular connect | ||||
| * | Catch occasional protocol errors in regular connect | Aldo Cortesi | 2016-12-16 | 1 | -11/+11 |
|/ | | | | Fixes #1843 and #1847 | ||||
* | Merge pull request #1845 from mhils/mitmweb-improvements | Aldo Cortesi | 2016-12-16 | 29 | -687/+59004 |
|\ | | | | | Mitmweb Improvements | ||||
| * | [web] various fixes | Maximilian Hils | 2016-12-12 | 20 | -411/+677 |
| | | |||||
| * | [web] style flow menu | Maximilian Hils | 2016-12-11 | 5 | -86/+158 |
| | | |||||
| * | [web] style start menu | Maximilian Hils | 2016-12-11 | 3 | -4/+18 |
| | | |||||
| * | [web] style options menu | Maximilian Hils | 2016-12-11 | 10 | -133/+203 |
| | | | | | | | | The other menus are WIP. | ||||
| * | [web] show proxy address, add websocket toggle | Maximilian Hils | 2016-12-11 | 8 | -492/+58387 |
| | | |||||
* | | Merge pull request #1857 from mitmproxy/bump-cryptography | Thomas Kriechbaumer | 2016-12-14 | 1 | -1/+1 |
|\ \ | | | | | | | update dependencies | ||||
| * | | update dependencies | Maximilian Hils | 2016-12-14 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1852 from mhils/simplenamespace | Maximilian Hils | 2016-12-13 | 3 | -23/+4 |
|\ \ | | | | | | | Use types.SimpleNamespace instead of custom NS class | ||||
| * | | use types.SimpleNamespace instead of custom NS class | Maximilian Hils | 2016-12-13 | 3 | -23/+4 |
| | | | |||||
* | | | Merge pull request #1851 from mhils/1850 | Maximilian Hils | 2016-12-13 | 5 | -36/+47 |
|\ \ \ | |/ / |/| | | fix #1850 | ||||
| * | | fix #1850 | Maximilian Hils | 2016-12-13 | 5 | -36/+47 |
|/ / | |||||
* | | console: respect follow in eventlog | Doug Freed | 2016-12-12 | 2 | -1/+5 |
| | | | | | | | | Also make it possible to toggle the option when the eventlog window has focus. | ||||
* | | console: increase eventlog size limit to 10000 | Doug Freed | 2016-12-12 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1842 from cortesi/optsave | Aldo Cortesi | 2016-12-12 | 10 | -37/+80 |
|\ \ | | | | | | | Save options to file from console & related work | ||||
| * | | Minor fixes | Aldo Cortesi | 2016-12-12 | 1 | -5/+4 |
| | | | |||||
| * | | Merge branch 'master' into optsave | Aldo Cortesi | 2016-12-12 | 16 | -31/+240 |
| |\ \ | |/ / |/| | | |||||
* | | | InstallBuilder (#1826) | Maximilian Hils | 2016-12-11 | 13 | -14/+216 |
| | | | |||||
* | | | Merge pull request #1838 from mhils/http2-is-difficult | Aldo Cortesi | 2016-12-12 | 1 | -13/+15 |
|\ \ \ | | | | | | | | | Disable HTTP/2 by default, add explicit on/off switches | ||||
| * | | | disable http2 by default, add explicit on/off switches | Maximilian Hils | 2016-12-11 | 1 | -13/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As long as major HTTP/2 implementers fail to implement the spec correctly, we need to disable HTTP/2 by default. We expect this to be fixed with the next release and re-enabled by default. https://github.com/mitmproxy/mitmproxy/issues/1745 https://github.com/mitmproxy/mitmproxy/issues/1824 | ||||
* | | | | Merge pull request #1837 from mhils/1809 | Maximilian Hils | 2016-12-11 | 2 | -4/+9 |
|\ \ \ \ | | | | | | | | | | | Fix #1809 | ||||
| * | | | | fix version sourcing in setup.py | Maximilian Hils | 2016-12-11 | 2 | -5/+7 |
| | | | | | |||||
| * | | | | fix #1809 | Maximilian Hils | 2016-12-10 | 1 | -0/+3 |
| | | | | | |||||
| | | * | | console: clean path prompt handling | Aldo Cortesi | 2016-12-12 | 6 | -27/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't trigger callback if no path is specified - Expand userdir centrally - Catch IO errors from callbacks and turn them into status messages | ||||
| | | * | | Replacements and SetHeaders are both defined as text in Options | Aldo Cortesi | 2016-12-12 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | Bytes don't play well with our config serialization or command-line args. | ||||
| | | * | | Extend type checker validate Sequence specs | Aldo Cortesi | 2016-12-12 | 2 | -7/+24 |
| | | | | |