aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-23 09:59:48 +0000