Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Use watchdog to reload scripts automatically. | Matthew Shao | 2015-11-11 | 3 | -0/+27 | |
| | | ||||||
* | | minor stylistic fixes | Maximilian Hils | 2015-11-14 | 2 | -6/+3 | |
| | | ||||||
* | | Feedback from PR #832 | Chris Czub | 2015-11-13 | 3 | -84/+51 | |
| | | ||||||
* | | Add custom content view plugin support for mitmproxy/mitmdump | Chris Czub | 2015-11-13 | 2 | -1/+52 | |
| | | ||||||
* | | Add new contentviews' content type mappings | Chris Czub | 2015-11-13 | 1 | -0/+10 | |
| | | ||||||
* | | Add "add" ContentView method & test | Chris Czub | 2015-11-13 | 1 | -0/+8 | |
|/ | ||||||
* | fix scripteditor bug | Maximilian Hils | 2015-11-10 | 1 | -0/+1 | |
| | ||||||
* | Bump version for next release cycle | Aldo Cortesi | 2015-11-07 | 1 | -1/+1 | |
| | ||||||
* | Bump version, update CONTRIBUTORS, CHANGELOG | Aldo Cortesi | 2015-11-06 | 1 | -1/+1 | |
| | ||||||
* | Catch and ignore thread errors on exit | Aldo Cortesi | 2015-11-06 | 1 | -3/+4 | |
| | | | | | | Keyboard interrupts bugger up Queues in some way, which causes a traceback on exit in many of our tools. The issue seems easiest to reproduce with binary builds on OSX. | |||||
* | fix copy to clipboard command when copying content | Marcelo Glezer | 2015-11-05 | 1 | -2/+2 | |
| | ||||||
* | Merge pull request #809 from zbuc/pfctl_errhandling | Maximilian Hils | 2015-11-04 | 1 | -2/+11 | |
|\ | | | | | Better error handling/reporting for pfctl failures on OS X | |||||
| * | PR 809 make code more pythonic | Chris Czub | 2015-11-04 | 1 | -2/+3 | |
| | | ||||||
| * | Declare & define insufficient_priv | Chris Czub | 2015-10-29 | 1 | -0/+1 | |
| | | ||||||
| * | Better error handling/reporting for pfctl failures on OS X | Chris Czub | 2015-10-29 | 1 | -2/+9 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2015-11-01 | 3 | -2/+7 | |
|\ \ | ||||||
| * | | Use ctrl+f and ctrl+b to scroll a page | gecko655 | 2015-10-30 | 2 | -0/+5 | |
| |/ | ||||||
| * | Merge pull request #791 from tunz/master | Maximilian Hils | 2015-10-28 | 1 | -2/+2 | |
| |\ | | | | | | | Prevent flowview from creating duplicated windows | |||||
| | * | Refresh flowview instead of reopen the same flowview | Choongwoo Han | 2015-10-08 | 1 | -4/+2 | |
| | | | ||||||
| | * | Prevent flowview from creating duplicated windows | Choongwoo Han | 2015-10-04 | 1 | -0/+2 | |
| | | | ||||||
* | | | fix #811 | Maximilian Hils | 2015-11-01 | 1 | -6/+5 | |
|/ / | ||||||
* | | fix #800 | Maximilian Hils | 2015-10-22 | 1 | -1/+2 | |
| | | ||||||
* | | update web builds, use watchify | Maximilian Hils | 2015-10-08 | 6 | -4299/+5698 | |
| | | ||||||
* | | default should not be None | Colin Bendell | 2015-10-07 | 1 | -1/+1 | |
| | | | | | | Fixed default value when self.address has not been set | |||||
* | | Check if server connection hasn't yet been initiated | Colin Bendell | 2015-10-07 | 1 | -2/+2 | |
|/ | | | This fixes #761 when NoneType error is thrown when non-TLS requests initiate a client request but the server connection hasn't yet been initiated. | |||||
* | Merge remote-tracking branch 'origin/master' | Maximilian Hils | 2015-10-03 | 1 | -1/+1 | |
|\ | ||||||
| * | Allow reading scripts from an anonymous pipe | sethp-jive | 2015-09-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | Bash (and many other shells) provide a nifty feature in "anonymous pipe" or "anonymous fifo" whereby the output of a subshell may be treated as a simple file by the parent shell: http://unix.stackexchange.com/a/156088 Unfortunately, libmproxy complains because that "file" is not a regular file, as os.path.isfile checks, e.g. giving the error "Not a file: /dev/fd/11". This patch is intended to provide for the following use-case: ``` mitmdump -s <(echo "def response(context, flow):\n flow.response.headers['newheader'] = [`hostname`]") ``` where `hostname` may be replaced with a more complicated lookup. | |||||
* | | fix #786 | Maximilian Hils | 2015-10-03 | 1 | -0/+5 | |
|/ | ||||||
* | fix #773 | Maximilian Hils | 2015-09-28 | 1 | -4/+14 | |
| | ||||||
* | fix tests | Maximilian Hils | 2015-09-28 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'http-models' | Maximilian Hils | 2015-09-28 | 9 | -88/+61 | |
|\ | ||||||
| * | adjust to netlib response changes + docs | Maximilian Hils | 2015-09-26 | 7 | -38/+36 | |
| | | ||||||
| * | adjust to netlib request changes + docs | Maximilian Hils | 2015-09-26 | 4 | -50/+25 | |
| | | ||||||
* | | handle Expect: 100-continue header, fix #770 | Maximilian Hils | 2015-09-28 | 3 | -5/+23 | |
|/ | ||||||
* | experimental: run tests using py.tests | Maximilian Hils | 2015-09-21 | 1 | -0/+1 | |
| | ||||||
* | fix minor bugs, add py.test compatibility | Maximilian Hils | 2015-09-21 | 1 | -1/+5 | |
| | ||||||
* | fix replay functionality | Maximilian Hils | 2015-09-19 | 1 | -4/+4 | |
| | ||||||
* | don't cache changed messages, fix #777 | Maximilian Hils | 2015-09-19 | 1 | -2/+3 | |
| | ||||||
* | experimental: don't interfere with headers, fix #93 | Maximilian Hils | 2015-09-18 | 5 | -6/+10 | |
| | ||||||
* | trigger inline script hooks for artifical responses, fix #775 | Maximilian Hils | 2015-09-18 | 1 | -10/+11 | |
| | ||||||
* | remove old server replay workaround, fix #774 | Maximilian Hils | 2015-09-18 | 1 | -5/+1 | |
| | ||||||
* | code -> status_code, httpversion -> http_version | Maximilian Hils | 2015-09-17 | 8 | -32/+32 | |
| | ||||||
* | move body assembly to netlib | Maximilian Hils | 2015-09-17 | 1 | -11/+2 | |
| | ||||||
* | use new netlib exceptions | Maximilian Hils | 2015-09-17 | 9 | -34/+35 | |
| | ||||||
* | Merge pull request #768 from mitmproxy/netlib-http1-refactor | Maximilian Hils | 2015-09-16 | 13 | -167/+137 | |
|\ | | | | | Adjust to netlib changes | |||||
| * | adjust to netlib changes | Maximilian Hils | 2015-09-16 | 13 | -167/+137 | |
| | | ||||||
* | | Merge pull request #751 from mitmproxy/readthedocs | Maximilian Hils | 2015-09-16 | 1 | -0/+4 | |
|\ \ | |/ |/| | Move Docs to readthedocs | |||||
| * | Merge branch 'master' into readthedocs | Maximilian Hils | 2015-09-08 | 7 | -24/+35 | |
| |\ | ||||||
| * \ | Merge branch 'master' into readthedocs | Maximilian Hils | 2015-09-06 | 9 | -103/+104 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master' into readthedocs | Maximilian Hils | 2015-09-04 | 1 | -8/+0 | |
| |\ \ \ |