aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1532 from cortesi/playbackAldo Cortesi2016-09-0711-491/+433
|\
| * Fix byte/string comparison error in server playbackAldo Cortesi2016-09-071-5/+11
| * Move server playback in to an addonAldo Cortesi2016-09-0611-491/+427
* | Merge pull request #1531 from Schamper/encoding-patchThomas Kriechbaumer2016-09-062-3/+9
|\ \ | |/ |/|
| * Make 'none' synonymous to 'identity'Schamper2016-09-062-10/+11
| * Add testSchamper2016-09-061-0/+5
| * Also fix for encodingSchamper2016-09-061-1/+1
| * Fix decoding when content-encoding: noneSchamper2016-09-061-1/+1
|/
* Merge pull request #1515 from Kriechi/bump-brotliAldo Cortesi2016-09-053-35/+39
|\
| * change test valueThomas Kriechbaumer2016-09-041-1/+1
| * improve netlib.encodingThomas Kriechbaumer2016-09-042-34/+38
| * bump brotli dependencyThomas Kriechbaumer2016-09-041-1/+1
|/
* Merge pull request #1523 from Kriechi/http2Aldo Cortesi2016-09-0410-70/+112
|\
| * http2: improve connection lostThomas Kriechbaumer2016-09-031-1/+2
| * improve CIThomas Kriechbaumer2016-09-032-1/+2
| * http2: improve kill and cleanup threadsThomas Kriechbaumer2016-09-032-11/+16
| * http2: assemble connect-request from objectThomas Kriechbaumer2016-09-031-7/+12
| * http2: fixesThomas Kriechbaumer2016-09-033-9/+16
| * http2: improve framereaderThomas Kriechbaumer2016-09-036-24/+29
| * http2: improve closed connection handlingThomas Kriechbaumer2016-09-031-6/+16
| * http2: improve zombie exception handlingThomas Kriechbaumer2016-09-032-2/+8
| * cleanupThomas Kriechbaumer2016-09-032-17/+19
|/
* Merge pull request #1513 from Kriechi/bump-depAldo Cortesi2016-09-032-2/+2
|\
| * cleanup travisThomas Kriechbaumer2016-09-011-1/+1
| * cryptography 1.5Thomas Kriechbaumer2016-09-011-1/+1
* | Merge pull request #1482 from Kriechi/improve-docsAldo Cortesi2016-09-032-89/+89
|\ \ | |/ |/|
| * update docs: introductionThomas Kriechbaumer2016-08-171-11/+10
| * update docs: how mitmproxy worksThomas Kriechbaumer2016-08-151-78/+79
* | Merge pull request #1488 from mitmproxy/websocketsThomas Kriechbaumer2016-09-0124-489/+967
|\ \
| * | cleanup testsThomas Kriechbaumer2016-09-014-3/+7
| * | add docs for websocket_handshake hookThomas Kriechbaumer2016-09-011-0/+12
| * | websockets: update protocol detectionThomas Kriechbaumer2016-09-016-59/+39
| * | add websockets support to mitmproxyThomas Kriechbaumer2016-09-017-9/+465
| * | websockets: refactor implementation and add testsThomas Kriechbaumer2016-09-019-473/+499
|/ /
* | Merge pull request #1517 from cortesi/httperrsThomas Kriechbaumer2016-09-012-27/+39
|\ \
| * | Improve the way we handle upstream errorsAldo Cortesi2016-09-012-27/+39
|/ /
* | Adjust flowbasic example for Options API changesAldo Cortesi2016-09-011-11/+13
* | Merge pull request #1511 from arjun23496/count_in_replaceThomas Kriechbaumer2016-08-316-9/+38
|\ \
| * | Lint fix - minorarjun234962016-08-312-3/+2
| * | Lint fix - replace testsarjun234962016-08-313-6/+9
| * | Lint fix - netlib headersarjun234962016-08-311-4/+2
| * | minor bug fix header replacearjun234962016-08-311-3/+7
| * | Added tests for replace in request,message,headerarjun234962016-08-314-1/+25
| * | Minor bug fix - messages.py replacearjun234962016-08-291-1/+1
| * | Added replace for request and headers - Fixed missing replace optionarjun234962016-08-292-5/+6
| * | Added count argument for replace for contents in bodyarjun234962016-08-261-2/+2
|/ /
* | Merge pull request #1493 from dufferzafar/long-urlsThomas Kriechbaumer2016-08-262-10/+20
|\ \
| * | Show full URL in flowviewShadab Zafar2016-08-231-4/+0
| * | Use unicode elipsis & make extra params a part of dictShadab Zafar2016-08-232-16/+16
| * | Use terminal width rather than a constantShadab Zafar2016-08-203-10/+12
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 11:04:38 +0000