aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1354 from mhils/explicit-optionsAldo Cortesi2016-07-1414-135/+192
|\
| * minor fixesMaximilian Hils2016-07-133-3/+3
| * make options explicitMaximilian Hils2016-07-1313-134/+191
|/
* Merge pull request #1353 from cortesi/streamAldo Cortesi2016-07-148-118/+167
|\
| * Stream to file -> addonAldo Cortesi2016-07-148-118/+167
* | Merge pull request #1352 from cortesi/stickycookieAldo Cortesi2016-07-1411-208/+204
|\|
| * Fix indeterminacy in sticky cookie testsAldo Cortesi2016-07-141-6/+9
| * Zap unused importsAldo Cortesi2016-07-141-3/+0
| * Ditch StickyCookie moduleAldo Cortesi2016-07-142-65/+2
| * StickyCookies to addonAldo Cortesi2016-07-149-140/+199
* | Merge pull request #1351 from cortesi/anticacheAldo Cortesi2016-07-148-21/+43
|\|
| * Merge remote-tracking branch 'upstream/master' into anticacheAldo Cortesi2016-07-140-0/+0
| |\ | |/ |/|
* | Merge pull request #1350 from cortesi/addons-cleanupAldo Cortesi2016-07-148-19/+39
|\ \
* \ \ Merge pull request #1349 from cortesi/addonsAldo Cortesi2016-07-1412-85/+63
|\ \ \
| | | * AntiCache to addonAldo Cortesi2016-07-148-21/+43
| | |/
| | * Disable OSX tests on Travis for nowAldo Cortesi2016-07-141-4/+4
| | * Add a .setter helper to OptionsAldo Cortesi2016-07-146-12/+24
| | * Handle OptionsError for command-line args.Aldo Cortesi2016-07-141-3/+11
| |/
| * Move StickyAuth into addonAldo Cortesi2016-07-1411-82/+62
| * func.__name__ works in both 2.7 and 3.5Aldo Cortesi2016-07-141-3/+1
|/
* Merge pull request #1348 from cortesi/addonsAldo Cortesi2016-07-1418-51/+194
|\
| * Satisfy our ruthless linting overlordsAldo Cortesi2016-07-131-0/+1
| * Add the addons mechanismAldo Cortesi2016-07-1313-10/+60
| * Merge branch 'options' into addonsAldo Cortesi2016-07-130-0/+0
| |\
| * | Basic outline of addonsAldo Cortesi2016-07-1312-43/+138
* | | Merge pull request #1347 from cortesi/optionsAldo Cortesi2016-07-138-24/+156
|\ \ \ | | |/ | |/|
| * | Raise AttributeError from Options.__getattr__Aldo Cortesi2016-07-131-1/+4
| |/
| * Show how options integrates with consoleAldo Cortesi2016-07-134-0/+11
| * More powerful Options schemeAldo Cortesi2016-07-136-25/+143
|/
* fixed bug (#1342)Clemens Brunner2016-07-122-4/+4
* 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 compatiblestrohu2016-07-121-2/+2
|/
* Merge pull request #1344 from strohu/patch-1Thomas Kriechbaumer2016-07-121-1/+1
|\
| * 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
|\
| * 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 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
|\
| * 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
|\
| * 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