aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* 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
* | Revert "Add API to programmatically create new requests (#1534)"Maximilian Hils2016-10-022-13/+0
* | fix docsMaximilian Hils2016-10-021-2/+1
* | Add API to programmatically create new requests (#1534)Tyler St. Onge2016-10-012-0/+13
* | Merge pull request #1588 from cortesi/consolereplayAldo Cortesi2016-09-303-16/+13
|\ \
| * | console: fix client replayAldo Cortesi2016-09-303-16/+13
|/ /
* | Merge remote-tracking branch 'upstream/master'Aldo Cortesi2016-09-302-3/+6
|\ \
| * | fix typoMaximilian Hils2016-09-281-1/+1
| |/
| * fix host header modification, refs #1571Maximilian Hils2016-09-281-2/+5
* | docs: minor formatting/cleanupsAldo Cortesi2016-09-302-39/+13
* | docs: remove auto-generated stubsAldo Cortesi2016-09-304-41/+0
* | docs: make sidebar headings more legibleAldo Cortesi2016-09-301-0/+4
|/
* parse_set_cookie header returns an empty list if no cookies are foundAldo Cortesi2016-09-282-12/+7
* Merge branch 'multi-cookie' of https://github.com/dufferzafar/mitmproxyAldo Cortesi2016-09-284-185/+269
|\
| * Clarify that 'expires' values MUST have a comma nowShadab Zafar2016-09-271-1/+4
| * Add tests for comma separated Set-CookiesShadab Zafar2016-09-271-10/+47
| * Modify format_set_cookie_header to take cookie listShadab Zafar2016-09-272-15/+24
| * Fixup an error with indicesShadab Zafar2016-09-271-1/+1
| * Can't have , in the sticky cookie testShadab Zafar2016-09-271-1/+0
| * Make needed changes in testsShadab Zafar2016-09-271-30/+33