Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #833 from zbuc/contentview_scripts | Maximilian Hils | 2015-11-13 | 7 | -28/+198 |
|\ | | | | | Contentview scripts | ||||
| * | Feedback from PR #832 | Chris Czub | 2015-11-13 | 7 | -106/+134 |
| | | |||||
| * | Add custom content view plugin support for mitmproxy/mitmdump | Chris Czub | 2015-11-13 | 4 | -1/+111 |
| | | |||||
| * | Add new contentviews' content type mappings | Chris Czub | 2015-11-13 | 2 | -0/+11 |
| | | |||||
| * | Add "add" ContentView method & test | Chris Czub | 2015-11-13 | 2 | -0/+21 |
| | | |||||
* | | Merge pull request #821 from zbuc/protobuf_contentview_test_fix | Maximilian Hils | 2015-11-13 | 1 | -1/+1 |
|\ \ | |/ |/| | Fix failing protobuf contentview test | ||||
| * | Fix failing protobuf contentview test | Chris Czub | 2015-11-06 | 1 | -1/+1 |
| | | |||||
* | | be more conservative about dependency versions | Maximilian Hils | 2015-11-13 | 1 | -21/+21 |
| | | | | | | We had various examples in the past where new releases break mitmproxy completely. Just as of today, the lxml guys pushed a new release to pypi, but did not include wheels - you cannot install mitmproxy on Windows without a compiler installed now. | ||||
* | | fix scripteditor bug | Maximilian Hils | 2015-11-10 | 1 | -0/+1 |
| | | |||||
* | | docs++ | Maximilian Hils | 2015-11-07 | 1 | -13/+13 |
| | | |||||
* | | Merge pull request #822 from ddworken/master | Maximilian Hils | 2015-11-07 | 1 | -0/+10 |
|\ \ | | | | | | | Added information on cert pinning (Fixes #689) | ||||
| * | | Added information on cert pinning (Fixes #689) | David Dworken | 2015-11-06 | 1 | -0/+10 |
|/ / | |||||
* / | Bump version for next release cycle | Aldo Cortesi | 2015-11-07 | 1 | -1/+1 |
|/ | |||||
* | Bump version, update CONTRIBUTORS, CHANGELOG | Aldo Cortesi | 2015-11-06 | 3 | -25/+85 |
| | |||||
* | Adjust pyinstaller spec paths | Aldo Cortesi | 2015-11-06 | 2 | -2/+2 |
| | |||||
* | 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. | ||||
* | Merge pull request #819 from tekii/hotfix-broken-copy | Maximilian Hils | 2015-11-05 | 1 | -2/+2 |
|\ | | | | | fix copy to clipboard command when copying content | ||||
| * | 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 |
| | | |||||
* | | docs: fix broken graphic | Maximilian Hils | 2015-11-02 | 1 | -0/+0 |
| | | |||||
* | | docs: improve mode flowchart | Maximilian Hils | 2015-11-02 | 2 | -0/+0 |
| | | |||||
* | | improve reverse proxy docs | Maximilian Hils | 2015-11-02 | 1 | -3/+3 |
| | | |||||
* | | try to fix appveyor race conditions in tests | Maximilian Hils | 2015-11-01 | 1 | -16/+4 |
| | | |||||
* | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2015-11-01 | 3 | -2/+7 |
|\ \ | |||||
| * \ | Merge pull request #810 from gecko655/ctrl_fb | Maximilian Hils | 2015-10-31 | 2 | -0/+5 |
| |\ \ | | |/ | |/| | Use ctrl+f and ctrl+b to scroll a page | ||||
| | * | 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 |
|/ / | |||||
* | | Merge pull request #805 from Badg/patch-1 | Maximilian Hils | 2015-10-23 | 1 | -1/+1 |
|\ \ | | | | | | | Update ubuntu installation to includ libjpeg | ||||
| * | | Ubuntu install missing libjpeg8-dev, zlib1g-dev | Nick Badger | 2015-10-22 | 1 | -1/+1 |
| | | | | | | | | | As per https://pillow.readthedocs.org/en/3.0.0/installation.html#linux-installation, to avoid missing install dependencies. | ||||
| * | | Update ubuntu installation to includ libjpeg | Nick Badger | 2015-10-22 | 1 | -1/+1 |
|/ / | | | | | Otherwise install fails with error "--enable-jpeg requested but jpeg not found" | ||||
* | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2015-10-22 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge pull request #801 from ben-lerner/doc_fix | Maximilian Hils | 2015-10-14 | 1 | -1/+1 |
| |\ \ | | | | | | | | | doc typo fix | ||||
| | * | | doc typo fix | Ben Lerner | 2015-10-13 | 1 | -1/+1 |
| |/ / | |||||
* / / | fix #800 | Maximilian Hils | 2015-10-22 | 1 | -1/+2 |
|/ / | |||||
* | | update web builds, use watchify | Maximilian Hils | 2015-10-08 | 21 | -4510/+5852 |
| | | |||||
* | | Merge pull request #797 from colinbendell/colinbendell-patch-1 | Maximilian Hils | 2015-10-08 | 1 | -2/+2 |
|\ \ | | | | | | | server_conn.address might not yet be established | ||||
| * | | 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 pull request #792 from tunz/patch-1 | Maximilian Hils | 2015-10-04 | 1 | -1/+1 |
|\ \ | |/ |/| | Correct a wrong link in CONTRIBUTING.md | ||||
| * | Update CONTRIBUTING.md | Choongwoo Han | 2015-10-04 | 1 | -1/+1 |
|/ | | | Wrong link | ||||
* | Merge remote-tracking branch 'origin/master' | Maximilian Hils | 2015-10-03 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #788 from sethp-jive/patch-1 | Maximilian Hils | 2015-10-01 | 1 | -1/+1 |
| |\ | | | | | | | Allow reading scripts from an anonymous pipe | ||||
| | * | 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 |
|/ |