aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #1835 from Kriechi/bumpMaximilian Hils2016-12-111-5/+5
|\ \ \ | |/ / |/| |
| * | bump dependenciesThomas Kriechbaumer2016-12-101-5/+5
|/ /
* | Merge pull request #1831 from mhils/contentviewsAldo Cortesi2016-12-1154-1011/+1257
|\ \ | |/ |/|
| * minor fixesMaximilian Hils2016-12-104-4/+4
| * add new xml/html pretty-printer :tada:Maximilian Hils2016-12-1012-2/+338
| * remove lxml-dependent codeMaximilian Hils2016-12-1011-130/+30
| * update tests, increase coverage, add type infoMaximilian Hils2016-12-0932-379/+435
| * split contentviews.py into mitmproxy.contentviewsMaximilian Hils2016-12-0917-672/+626
* | minor fixesMaximilian Hils2016-12-101-1/+2
* | Merge pull request #1834 from Kriechi/remove_ssl_match_hostnameMaximilian Hils2016-12-102-5/+4
|\ \ | |/ |/|
| * remove backport.ssl_match_hostnameThomas Kriechbaumer2016-12-102-5/+4
* | Merge pull request #1827 from mhils/issue-1803Maximilian Hils2016-12-091-0/+1
|\ \
| * | fix #1803Maximilian Hils2016-12-091-0/+1
|/ /
* | Merge pull request #1823 from cortesi/options2Aldo Cortesi2016-12-087-29/+54
|\ \
| * | options: add a merge method to assimilate optionsAldo Cortesi2016-12-087-29/+54
|/ /
* | Merge pull request #1822 from cortesi/clogAldo Cortesi2016-12-081-4/+6
|\ \
| * | console: use an addon to capture logsAldo Cortesi2016-12-081-4/+6
* | | Merge pull request #1806 from cortesi/optionsAldo Cortesi2016-12-0824-463/+561
|\| | | |/ |/|
| * Minor tweaksAldo Cortesi2016-12-084-19/+21
| * Amalgamate all the Options objectsAldo Cortesi2016-12-087-61/+61
| * Replace configargparse with argparse, enable new options loadingAldo Cortesi2016-12-087-122/+126
| * Add YAML serialization of optionsAldo Cortesi2016-12-081-4/+0
| * options: defaults are a class attributeAldo Cortesi2016-12-082-9/+9
| * Options - avoid mutation, API cleanup, has_changedAldo Cortesi2016-12-081-0/+1
| * options: save defaults, add .reset() to restore defaultsAldo Cortesi2016-12-082-10/+14
| * Add YAML serialization of optionsAldo Cortesi2016-12-083-1/+125
| * options: defaults are a class attributeAldo Cortesi2016-12-082-10/+23
| * Correct refresh_server_playback option defaultAldo Cortesi2016-12-081-1/+1
| * Add OptManager.subscribe, use it to clean up palettes in consoleAldo Cortesi2016-12-084-22/+61
| * Options - avoid mutation, API cleanup, has_changedAldo Cortesi2016-12-086-37/+53
| * Get rid of tfile testing optionAldo Cortesi2016-12-086-38/+31
| * Clean up dump testsAldo Cortesi2016-12-083-174/+38
| * options: save defaults, add .reset() to restore defaultsAldo Cortesi2016-12-083-16/+58
|/
* Merge pull request #1817 from Kriechi/fix-1816Thomas Kriechbaumer2016-12-065-21/+90
|\
| * tls_parser: allow optional extensionsThomas Kriechbaumer2016-12-065-21/+90
|/
* Merge pull request #1810 from Kriechi/constructMaximilian Hils2016-12-044-154/+123
|\
| * upgrade to construct 2.8 and new APIThomas Kriechbaumer2016-12-044-154/+123
* | Merge pull request #1813 from dwfreed/patch-1Maximilian Hils2016-12-041-1/+1
|\ \
| * | release: fix dropping _main suffixDoug Freed2016-12-041-1/+1
|/ /
* | Merge pull request #1801 from Kriechi/simplify-alpn-opensslThomas Kriechbaumer2016-12-0410-116/+151
|\ \ | |/ |/|
| * simplify ALPN and OpenSSL on macOSThomas Kriechbaumer2016-12-0410-116/+151
|/
* fix whitespaceThomas Kriechbaumer2016-12-031-0/+1
* fix indentationThomas Kriechbaumer2016-12-031-2/+2
* fix ALPN usageThomas Kriechbaumer2016-12-021-2/+2
* Merge pull request #1797 from Kriechi/websocket++Maximilian Hils2016-12-013-22/+67
|\
| * websocket: update close handshake testsThomas Kriechbaumer2016-11-291-0/+4
| * websocket: make flowfilter workThomas Kriechbaumer2016-11-291-6/+15
| * websocket: carry over per-message compression bitThomas Kriechbaumer2016-11-291-0/+2
| * websocket: reduce connection timeoutThomas Kriechbaumer2016-11-291-1/+1
| * websocket: fix message type on chunkingThomas Kriechbaumer2016-11-291-2/+5