Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1354 from mhils/explicit-options | Aldo Cortesi | 2016-07-14 | 14 | -135/+192 |
|\ | |||||
| * | minor fixes | Maximilian Hils | 2016-07-13 | 3 | -3/+3 |
| * | make options explicit | Maximilian Hils | 2016-07-13 | 13 | -134/+191 |
|/ | |||||
* | Merge pull request #1353 from cortesi/stream | Aldo Cortesi | 2016-07-14 | 8 | -118/+167 |
|\ | |||||
| * | Stream to file -> addon | Aldo Cortesi | 2016-07-14 | 8 | -118/+167 |
* | | Merge pull request #1352 from cortesi/stickycookie | Aldo Cortesi | 2016-07-14 | 11 | -208/+204 |
|\| | |||||
| * | Fix indeterminacy in sticky cookie tests | Aldo Cortesi | 2016-07-14 | 1 | -6/+9 |
| * | Zap unused imports | Aldo Cortesi | 2016-07-14 | 1 | -3/+0 |
| * | Ditch StickyCookie module | Aldo Cortesi | 2016-07-14 | 2 | -65/+2 |
| * | StickyCookies to addon | Aldo Cortesi | 2016-07-14 | 9 | -140/+199 |
* | | Merge pull request #1351 from cortesi/anticache | Aldo Cortesi | 2016-07-14 | 8 | -21/+43 |
|\| | |||||
| * | Merge remote-tracking branch 'upstream/master' into anticache | Aldo Cortesi | 2016-07-14 | 0 | -0/+0 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1350 from cortesi/addons-cleanup | Aldo Cortesi | 2016-07-14 | 8 | -19/+39 |
|\ \ | |||||
* \ \ | Merge pull request #1349 from cortesi/addons | Aldo Cortesi | 2016-07-14 | 12 | -85/+63 |
|\ \ \ | |||||
| | | * | AntiCache to addon | Aldo Cortesi | 2016-07-14 | 8 | -21/+43 |
| | |/ | |||||
| | * | Disable OSX tests on Travis for now | Aldo Cortesi | 2016-07-14 | 1 | -4/+4 |
| | * | Add a .setter helper to Options | Aldo Cortesi | 2016-07-14 | 6 | -12/+24 |
| | * | Handle OptionsError for command-line args. | Aldo Cortesi | 2016-07-14 | 1 | -3/+11 |
| |/ | |||||
| * | Move StickyAuth into addon | Aldo Cortesi | 2016-07-14 | 11 | -82/+62 |
| * | func.__name__ works in both 2.7 and 3.5 | Aldo Cortesi | 2016-07-14 | 1 | -3/+1 |
|/ | |||||
* | Merge pull request #1348 from cortesi/addons | Aldo Cortesi | 2016-07-14 | 18 | -51/+194 |
|\ | |||||
| * | Satisfy our ruthless linting overlords | Aldo Cortesi | 2016-07-13 | 1 | -0/+1 |
| * | Add the addons mechanism | Aldo Cortesi | 2016-07-13 | 13 | -10/+60 |
| * | Merge branch 'options' into addons | Aldo Cortesi | 2016-07-13 | 0 | -0/+0 |
| |\ | |||||
| * | | Basic outline of addons | Aldo Cortesi | 2016-07-13 | 12 | -43/+138 |
* | | | Merge pull request #1347 from cortesi/options | Aldo Cortesi | 2016-07-13 | 8 | -24/+156 |
|\ \ \ | | |/ | |/| | |||||
| * | | Raise AttributeError from Options.__getattr__ | Aldo Cortesi | 2016-07-13 | 1 | -1/+4 |
| |/ | |||||
| * | Show how options integrates with console | Aldo Cortesi | 2016-07-13 | 4 | -0/+11 |
| * | More powerful Options scheme | Aldo Cortesi | 2016-07-13 | 6 | -25/+143 |
|/ | |||||
* | fixed bug (#1342) | Clemens Brunner | 2016-07-12 | 2 | -4/+4 |
* | http2: fix race-condition in tests | Thomas Kriechbaumer | 2016-07-12 | 1 | -1/+1 |
* | Merge pull request #1345 from strohu/patch-2 | Thomas Kriechbaumer | 2016-07-12 | 1 | -2/+2 |
|\ | |||||
| * | Make sudo pfctl error check Python 3 compatible | strohu | 2016-07-12 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #1344 from strohu/patch-1 | Thomas Kriechbaumer | 2016-07-12 | 1 | -1/+1 |
|\ | |||||
| * | Fix is_ascii check when determining next layer | strohu | 2016-07-12 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1338 from Kriechi/http2-tests | Thomas Kriechbaumer | 2016-07-10 | 2 | -96/+241 |
|\ | |||||
| * | http2: more coverage | Thomas Kriechbaumer | 2016-07-10 | 2 | -43/+231 |
| * | http2: simplify test class | Thomas Kriechbaumer | 2016-07-10 | 1 | -65/+22 |
|/ | |||||
* | update dependency and loosen restrictions on good citizens | Thomas Kriechbaumer | 2016-07-10 | 1 | -7/+7 |
* | Merge pull request #1335 from mitmproxy/travis | Thomas Kriechbaumer | 2016-07-10 | 1 | -13/+20 |
|\ | |||||
| * | move OSX Travis job to py3 for snapshots | Thomas Kriechbaumer | 2016-07-10 | 1 | -13/+20 |
* | | fix sysinfo for py3 | Thomas Kriechbaumer | 2016-07-10 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1336 from dufferzafar/rtool-hotfix | Thomas Kriechbaumer | 2016-07-10 | 1 | -1/+1 |
|\ | |||||
| * | Decode commit value in rtool | Shadab Zafar | 2016-07-10 | 1 | -1/+1 |
* | | revert travis osx changes | Thomas Kriechbaumer | 2016-07-09 | 2 | -11/+12 |
|/ | |||||
* | Merge pull request #1324 from dufferzafar/sticky-cookies | Maximilian Hils | 2016-07-09 | 4 | -7/+77 |
|\ | |||||
| * | Remove redundant tests | Shadab Zafar | 2016-07-10 | 1 | -12/+0 |
| * | Test cookies.is_expired separately | Shadab Zafar | 2016-07-10 | 2 | -4/+30 |
| * | Move cookie expiry detection to separate function | Shadab Zafar | 2016-07-09 | 2 | -17/+24 |
| * | Add tests for deletion of stickycookies | Shadab Zafar | 2016-07-09 | 1 | -2/+26 |