aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| |
| * Remove py35 section from tox.iniShadab Zafar2016-07-091-5/+0
| |
| * strutils.hexdump returns native_stringsShadab Zafar2016-07-092-2/+2
| |
| * Set verbosity & flow_detail to 0Shadab Zafar2016-07-091-0/+12
| |
| * py3++Shadab Zafar2016-07-093-24/+29
| |
| * py3++: test_dumpShadab Zafar2016-07-093-5/+6
| |
* | travis: move osx test to the topMaximilian Hils2016-07-091-6/+6
|/ | | OSX is the slow one, so it should start straight away.
* Merge pull request #1327 from mitmproxy/remove-script-contextMaximilian Hils2016-07-0848-312/+267
|\ | | | | Remove script context
| * move script context to mitmproxy.ctxMaximilian Hils2016-07-0811-41/+40
| |
| * remove script contextsMaximilian Hils2016-07-0716-200/+131
| |
| * remove context from all scriptsMaximilian Hils2016-07-0733-112/+137
| |
* | py3++Maximilian Hils2016-07-083-2/+6
| |
* | fix #1314Maximilian Hils2016-07-082-21/+23
| |
* | Merge pull request #1330 from jpkrause/masterMaximilian Hils2016-07-086-72/+14
|\ \ | | | | | | Added flow converters for versions 0.11 and 0.12
| * | Updated coding style and modified flow format compat test to use v0.11 and ↵jpkrause2016-07-086-72/+5
| | | | | | | | | | | | v0.10 dump files
| * | Added flow converters for versions 0.11 and 0.12jpkrause2016-07-081-0/+9
|/ /
* | Merge pull request #1328 from Kriechi/fix-1326Thomas Kriechbaumer2016-07-081-19/+26
|\ \ | | | | | | http2: fix self-depended streams
| * | http2: fix self-depended streamsThomas Kriechbaumer2016-07-081-19/+26
| |/
* / simplify tox test exclusionThomas Kriechbaumer2016-07-081-1/+1
|/
* fix testsMaximilian Hils2016-07-071-0/+1
|
* tests++Maximilian Hils2016-07-072-1/+16
|
* py3++Maximilian Hils2016-07-077-19/+20
|
* py3++Maximilian Hils2016-07-077-88/+114
|
* reorder travis jobsThomas Kriechbaumer2016-07-071-7/+7
|
* Merge pull request #1325 from Kriechi/dufferzafar-py3-h2Thomas Kriechbaumer2016-07-073-13/+13
|\ | | | | HTTP/2: Python 3-compatibility
| * py3++Thomas Kriechbaumer2016-07-072-9/+9
| |
| * py3++: test_protocol_http2Shadab Zafar2016-07-072-4/+4
|/
* py3++Maximilian Hils2016-07-074-4/+5
|
* Merge pull request #1323 from mhils/test-examplesMaximilian Hils2016-07-073-1/+14
|\ | | | | Exclude harparser script on Python 3
| * disable harparser on py3Maximilian Hils2016-07-073-1/+14
|/
* Merge pull request #1318 from mhils/tnetstring3-unicode-typeThomas Kriechbaumer2016-07-0714-278/+212
|\ | | | | [tests actually pass] Add unicode to tnetstring3
| * sni is now str, not bytesMaximilian Hils2016-07-0610-43/+44
| |
| * fix testsMaximilian Hils2016-07-062-2/+2
| |
| * fix dump file cross compat between python versionsMaximilian Hils2016-07-062-32/+61
| |