aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* minor cleanupMaximilian Hils2016-09-223-17/+11
|
* Removed obsolete code.smill@cuckoo.sh2016-09-221-6/+2
|
* Introduced comment regarding socket manipulation through the server_conn stub.smill@cuckoo.sh2016-09-221-0/+1
|
* Commented on IP_TRANSPARENT and changed an exception type.smill@cuckoo.sh2016-09-221-1/+2
|
* Fixed restructuredText error.smill2016-09-151-1/+2
|
* Added a description to the shim loader, and renamed it.smill2016-09-141-0/+8
|
* Fixed travis-ci issues.smill2016-09-143-1/+3
|
* Prevent crash in case of a connection timeout.smill2016-09-141-3/+5
|
* Improved the documentation.smill2016-09-051-5/+17
|
* Made it possible to modify the server_conn.connection attribute,smill2016-09-052-3/+8
| | | | using the serverconnect stub.
* Removed a mistakenly inserted newline character.smill2016-09-041-1/+0
|
* Improved error-handling / supplemented documention.smill2016-09-046-9/+33
|
* Introduced some minor improvements to the shim loader.smill2016-09-031-19/+27
|
* Introduced the capability to spoof the source addresssmill2016-09-036-7/+101
| | | | of outgoing sessions + an accompanying shim loader.
* Merge pull request #1513 from Kriechi/bump-depAldo Cortesi2016-09-032-2/+2
|\ | | | | cryptography 1.5
| * 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: how mitmproxy works
| * 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
|\ \ | | | | | | add WebSockets support
| * | 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 errors
| * | Improve the way we handle upstream errorsAldo Cortesi2016-09-012-27/+39
|/ / | | | | | | | | | | | | - Don't log a traceback for either HTTP or HTTPS DNS resolution or TCP connection errors. These are "ordinary" errors, not mitmproxy issues. - Ensure that the error handler is correctly called for SSL-related protocol errors.
* | 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
|\ \ | | | | | | Fixes #1495 - Added count argument for replacing contents in body
| * | 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
|\ \ | | | | | | Truncate URLs in console
| * | 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
| | |
| * | Truncate URLs in consoleShadab Zafar2016-08-202-3/+15
| | |
* | | Merge pull request #1510 from mkagenius/dividebyzeroThomas Kriechbaumer2016-08-262-0/+4
|\ \ \ | | | | | | | | fixed #1501 : Divide by zero error came when string was empty, also a test
| * | | fixing lint errorManish Kumar2016-08-261-0/+1
| | | |
| * | | fixed : Divide by zero error came when string was empty, also a testManish Kumar2016-08-262-1/+4
|/ / /
* | | allow test classes to dynamically specify ssl contextThomas Kriechbaumer2016-08-241-1/+2
| | |
* | | refactor httpThomas Kriechbaumer2016-08-241-7/+11
| | |
* | | ignore all coverage temp filesThomas Kriechbaumer2016-08-241-1/+1
| | |
* | | wrap long linesThomas Kriechbaumer2016-08-242-4/+24
| | |