aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* First-order conversion to Python3-onlyAldo Cortesi2016-10-1731-203/+90
* Add stub converter for 0.19 io formatAldo Cortesi2016-10-171-0/+6
* Bump version post releaseAldo Cortesi2016-10-171-1/+1
* Bump to 0.18.1 to fix pypi obstreperousnessAldo Cortesi2016-10-163-106/+67
* Merge pull request #1602 from cortesi/scriptdocsAldo Cortesi2016-10-1630-466/+624
|\
| * docs: concurrency, developing scriptsAldo Cortesi2016-10-163-32/+20
| * scripts: keep scripts just after the ScriptLoader in addon chainAldo Cortesi2016-10-164-16/+43
| * docs: scripts on saved flowsAldo Cortesi2016-10-161-7/+23
| * mitmdump: fix addon order - dumper must be lastAldo Cortesi2016-10-161-1/+1
| * docs: link to correct tagMaximilian Hils2016-10-161-5/+16
| * docs: logging and the contextAldo Cortesi2016-10-166-27/+68
| * scripts: handle SystemExit from scripts explicitlyAldo Cortesi2016-10-161-0/+2
| * mitmdump: show script errors on startupAldo Cortesi2016-10-161-1/+1
| * docs: overview, classes, argumentsAldo Cortesi2016-10-167-47/+86
| * docs: improve external source links, tweak code docsAldo Cortesi2016-10-163-38/+53
| * Clean up models.http a bitAldo Cortesi2016-10-161-31/+17
| * docs: cleanups improvements and fighting sphinxAldo Cortesi2016-10-1618-356/+389
|/
* fix #1611Maximilian Hils2016-10-151-4/+2
* update CHANGELOGMaximilian Hils2016-10-151-0/+48
* Merge pull request #1610 from mhils/issue-1605Maximilian Hils2016-10-142-12/+19
|\
| * add regression test for #1605Maximilian Hils2016-10-141-0/+13
| * fix #1605Maximilian Hils2016-10-131-12/+6
|/
* Issue 1461 (#1609)Sanchit Sokhey2016-10-131-3/+14
* Merge pull request #1603 from mhils/eofMaximilian Hils2016-10-052-16/+5
|\
| * simplify eof detectionMaximilian Hils2016-10-052-16/+5
|/
* Merge pull request #1601 from cortesi/certcapAldo Cortesi2016-10-053-1/+37
|\
| * certutils: cap the cert store size at 100 by defaultAldo Cortesi2016-10-052-0/+36
| * debug: use correct fp for memory object outputAldo Cortesi2016-10-051-1/+1
|/
* Merge pull request #1598 from cortesi/dummystateThomas Kriechbaumer2016-10-043-10/+13
|\
| * mitmdump: use a dummy state objectAldo Cortesi2016-10-043-10/+13
* | use flt instead of filt for flowfilter expressionsThomas Kriechbaumer2016-10-044-11/+11
* | Merge pull request #1597 from cortesi/debugAldo Cortesi2016-10-042-4/+23
|\|
| * debug: Hard exit after debug signalAldo Cortesi2016-10-042-4/+9
| * debug: add a dump of objects in memoryAldo Cortesi2016-10-041-0/+14
* | Merge pull request #1596 from cortesi/addonsAldo Cortesi2016-10-0412-46/+81
|\|
| * Consolidate loggingAldo Cortesi2016-10-0412-46/+81
* | Merge pull request #1592 from cortesi/wsAldo Cortesi2016-10-0411-53/+66
|\|
| * http2: support the requestheaders eventAldo Cortesi2016-10-043-14/+17
| * Clarify channel interaction patternAldo Cortesi2016-10-042-12/+7
| * http2: frames don't have a human_readable methodAldo Cortesi2016-10-041-4/+4
| * Add requestheaders eventAldo Cortesi2016-10-045-17/+32
| * websockets_handshake -> websocket_handshakeAldo Cortesi2016-10-045-7/+7
|/
* Merge pull request #1587 from Kriechi/rename-filtAldo Cortesi2016-10-0419-166/+144
|\
| * fix flowfilter.match argsThomas Kriechbaumer2016-10-037-24/+24
| * use flowfilter.matchThomas Kriechbaumer2016-10-038-30/+24
| * move flow.match to flowfilter.matchThomas Kriechbaumer2016-10-032-19/+8
| * rename mitmproxy.filt -> mitmproxy.flowfilterThomas Kriechbaumer2016-10-0318-133/+128
* | update dependenciesMaximilian Hils2016-10-031-2/+2
* | Merge pull request #1590 from rofreg/chain_file_conflictMaximilian Hils2016-10-031-5/+1
|\ \ | |/ |/|
| * Fix SSL errorRyan Laughlin2016-09-301-5/+1