aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | AntiCache to addonAldo Cortesi2016-07-148-21/+43
| | |/ / / /
| | * | | | Disable OSX tests on Travis for nowAldo Cortesi2016-07-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll re-enable as soon as this is sorted out: https://github.com/travis-ci/travis-ci/issues/6303
| | * | | | Add a .setter helper to OptionsAldo Cortesi2016-07-146-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This returns a function that sets a named attribute, and is handy for event-driven code like mitmproxy console.
| | * | | | Handle OptionsError for command-line args.Aldo Cortesi2016-07-141-3/+11
| |/ / / /
| * | | | Move StickyAuth into addonAldo Cortesi2016-07-1411-82/+62
| | | | | | | | | | | | | | | | | | | | | | | | | This is the first addon that handles an OptionsError, so this commit also demos how this works in console. Handling of command-line erorrs is on its way.
| * | | | func.__name__ works in both 2.7 and 3.5Aldo Cortesi2016-07-141-3/+1
|/ / / / | | | | | | | | | | | | Thanks to @resam and @dwfreed for pointing this out
* | | | Merge pull request #1348 from cortesi/addonsAldo Cortesi2016-07-1418-51/+194
|\ \ \ \ | | | | | | | | | | Addons
| * | | | Satisfy our ruthless linting overlordsAldo Cortesi2016-07-131-0/+1
| | | | |
| * | | | Add the addons mechanismAldo Cortesi2016-07-1313-10/+60
| | | | | | | | | | | | | | | | | | | | | | | | | Demonstrate how it works and interacts with Options by adding our first new builtin: anticomp.
| * | | | Merge branch 'options' into addonsAldo Cortesi2016-07-130-0/+0
| |\ \ \ \
| * | | | | Basic outline of addonsAldo Cortesi2016-07-1312-43/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add addons.py, integrate with our event mechanism, and change the Master API so options is the first init argument.
* | | | | | Merge pull request #1347 from cortesi/optionsAldo Cortesi2016-07-138-24/+156
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Options
| * | | | | Raise AttributeError from Options.__getattr__Aldo Cortesi2016-07-131-1/+4
| |/ / / /
| * | | | Show how options integrates with consoleAldo Cortesi2016-07-134-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | This is not functional at the moment, because all mutable options are still on master.
| * | | | More powerful Options schemeAldo Cortesi2016-07-136-25/+143
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prepares us for the addon configuration mechanism and gives us a more flexible way to handle options changes. This changeset should spell the end of the current anti-pattern in our codebase where we duplicate data out of options onto the master when mutability is needed. From now on, Options can be the one source of thruth. - Change notifications - Rollback on error
* | | | fixed bug (#1342)Clemens Brunner2016-07-122-4/+4
| | | | | | | | | | | | fix minor mitmweb issues
* | | | http2: fix race-condition in testsThomas Kriechbaumer2016-07-121-1/+1
| | | |
* | | | Merge pull request #1345 from strohu/patch-2Thomas Kriechbaumer2016-07-121-2/+2
|\ \ \ \ | | | | | | | | | | Make sudo pfctl error check Python 3 compatible
| * | | | Make sudo pfctl error check Python 3 compatiblestrohu2016-07-121-2/+2
|/ / / / | | | | | | | | In Python 3, subprocess.check_output() returns a sequence of bytes. This change ensures that it will be converted to a string, so the substring test for the sudo error message does not raise a TypeError. This fixes the code in Python 3 while remaining compatible with Python 2.
* | | | Merge pull request #1344 from strohu/patch-1Thomas Kriechbaumer2016-07-121-1/+1
|\ \ \ \ | | | | | | | | | | Fix is_ascii check when determining next layer
| * | | | Fix is_ascii check when determining next layerstrohu2016-07-121-1/+1
|/ / / /
* | | | Merge pull request #1338 from Kriechi/http2-testsThomas Kriechbaumer2016-07-102-96/+241
|\ \ \ \ | | | | | | | | | | Improve HTTP/2 test coverage
| * | | | http2: more coverageThomas Kriechbaumer2016-07-102-43/+231
| | | | |
| * | | | http2: simplify test classThomas Kriechbaumer2016-07-101-65/+22
|/ / / /
* | | | update dependency and loosen restrictions on good citizensThomas Kriechbaumer2016-07-101-7/+7
| | | |
* | | | Merge pull request #1335 from mitmproxy/travisThomas Kriechbaumer2016-07-101-13/+20
|\ \ \ \ | | | | | | | | | | move OSX Travis job to py3 for snapshots
| * | | | move OSX Travis job to py3 for snapshotsThomas Kriechbaumer2016-07-101-13/+20
| | | | |
* | | | | fix sysinfo for py3Thomas Kriechbaumer2016-07-101-1/+1
|/ / / /
* | | | Merge pull request #1336 from dufferzafar/rtool-hotfixThomas Kriechbaumer2016-07-101-1/+1
|\ \ \ \ | | | | | | | | | | rtool hotfix
| * | | | Decode commit value in rtoolShadab Zafar2016-07-101-1/+1
| | | | |
* | | | | revert travis osx changesThomas Kriechbaumer2016-07-092-11/+12
|/ / / /
* | | | Merge pull request #1324 from dufferzafar/sticky-cookiesMaximilian Hils2016-07-094-7/+77
|\ \ \ \ | | | | | | | | | | Delete stickycookies when told by the server
| * | | | Remove redundant testsShadab Zafar2016-07-101-12/+0
| | | | |
| * | | | Test cookies.is_expired separatelyShadab Zafar2016-07-102-4/+30
| | | | |
| * | | | Move cookie expiry detection to separate functionShadab Zafar2016-07-092-17/+24
| | | | |
| * | | | Add tests for deletion of stickycookiesShadab Zafar2016-07-091-2/+26
| | | | |
| * | | | Delete stickycookies when told by the serverShadab Zafar2016-07-091-4/+29
| | | | | | | | | | | | | | | | | | | | Fixes #1096
* | | | | add whitespace to improve url parsingThomas Kriechbaumer2016-07-091-1/+1
| | | | |
* | | | | fix pip install on osx travisThomas Kriechbaumer2016-07-091-1/+1
| | | | |
* | | | | upgrade pip on osx travisThomas Kriechbaumer2016-07-092-1/+3
| | | | |
* | | | | try to fix weird install behaviourThomas Kriechbaumer2016-07-091-2/+2
| | | | |
* | | | | update osx travisThomas Kriechbaumer2016-07-091-10/+7
| | | | |
* | | | | cleanup toxThomas Kriechbaumer2016-07-091-5/+3
| | | | |
* | | | | Merge pull request #1334 from mhils/cleanupThomas Kriechbaumer2016-07-093-7/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused files
| * | | | | remove unused filesMaximilian Hils2016-07-093-7/+0
|/ / / / /
* | | | | Update README.rstMaximilian Hils2016-07-091-3/+2
| | | | |
* | | | | Add Python 3.5 markers to setup.pyMaximilian Hils2016-07-091-0/+2
| | | | |
* | | | | remove pathod doc leftoversMaximilian Hils2016-07-093-384/+0
|/ / / /
* | | | Merge pull request #1299 from dufferzafar/py3-dumpThomas Kriechbaumer2016-07-096-33/+47
|\ \ \ \ | | | | | | | | | | Python 3 - test_dump
| * | | | Make escape_control_characters handle strings on Py2Shadab Zafar2016-07-092-4/+5
| | | | |