aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* travis: fix osx binary build conditionMaximilian Hils2015-11-291-1/+1
|
* travis: build binaries on osxMaximilian Hils2015-11-291-4/+17
|
* disable concurrency tests on appveyorMaximilian Hils2015-11-292-2/+3
|
* lessen test race conditionsMaximilian Hils2015-11-292-2/+2
|
* add new pyinstaller spec filesMaximilian Hils2015-11-296-99/+42
|
* fix #847Maximilian Hils2015-11-272-3/+3
|
* remove unnecessary race conditions in testsMaximilian Hils2015-11-271-8/+2
|
* add memoryleak debug scriptMaximilian Hils2015-11-261-0/+38
|
* fix #831Maximilian Hils2015-11-261-1/+1
|
* http: catch all exceptionsMaximilian Hils2015-11-261-7/+6
|
* simplify Client/ServerConnection.__repr__Maximilian Hils2015-11-261-6/+4
|
* establish tls with client even if server connection failsMaximilian Hils2015-11-261-2/+1
|
* script reloader: minor fixesMaximilian Hils2015-11-261-0/+3
|
* travis: add OSX testsMaximilian Hils2015-11-261-0/+10
|
* fix #842Maximilian Hils2015-11-262-11/+26
|
* skip timing tests on appveyorMaximilian Hils2015-11-243-5/+18
|
* disable script reloaderMaximilian Hils2015-11-241-1/+1
| | | | This currently throws some errors on OSX.
* Merge branch 'travis-contentviews'Maximilian Hils2015-11-201-1/+1
|\
| * travis: test optional content views as wellMaximilian Hils2015-11-071-1/+1
| |
* | Merge pull request #836 from MatthewShao/fix#835Maximilian Hils2015-11-181-1/+2
|\ \ | | | | | | Fix #835 , can display unicode character correctly
| * | fix #835 , can display unicode character correctlyMatthew Shao2015-11-161-1/+2
|/ /
* | fix appveyor race conditions in testsMaximilian Hils2015-11-141-6/+4
| |
* | fix HTTPS Proxy-Authentication, refs #824Maximilian Hils2015-11-142-1/+7
| |
* | finalize script reloading :tada:Maximilian Hils2015-11-146-58/+96
| |
* | structure libmproxy.scriptMaximilian Hils2015-11-1411-223/+293
|\ \
| * | Decouple libmproxy.script from libmproxy.flowMatthew Shao2015-11-133-18/+25
| | |
| * | Move the observer initalization to the constructor of ScriptMatthew Shao2015-11-112-9/+9
| | | | | | | | | | | | | | | class.Should work with both mitmproxy and mitmdump now. Change the names in PEP8 style.
| * | Use watchdog to reload scripts automatically.Matthew Shao2015-11-113-0/+27
| | |
* | | minor stylistic fixesMaximilian Hils2015-11-143-17/+16
| | |
* | | Merge pull request #833 from zbuc/contentview_scriptsMaximilian Hils2015-11-137-28/+198
|\ \ \ | | | | | | | | Contentview scripts
| * | | Feedback from PR #832Chris Czub2015-11-137-106/+134
| | | |
| * | | Add custom content view plugin support for mitmproxy/mitmdumpChris Czub2015-11-134-1/+111
| | | |
| * | | Add new contentviews' content type mappingsChris Czub2015-11-132-0/+11
| | | |
| * | | Add "add" ContentView method & testChris Czub2015-11-132-0/+21
| | | |
* | | | Merge pull request #821 from zbuc/protobuf_contentview_test_fixMaximilian Hils2015-11-131-1/+1
|\ \ \ \ | |/ / / |/| | | Fix failing protobuf contentview test
| * | | Fix failing protobuf contentview testChris Czub2015-11-061-1/+1
| | | |
* | | | be more conservative about dependency versionsMaximilian Hils2015-11-131-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 bugMaximilian Hils2015-11-101-0/+1
| | |
* | | docs++Maximilian Hils2015-11-071-13/+13
| | |
* | | Merge pull request #822 from ddworken/masterMaximilian Hils2015-11-071-0/+10
|\ \ \ | | | | | | | | Added information on cert pinning (Fixes #689)
| * | | Added information on cert pinning (Fixes #689)David Dworken2015-11-061-0/+10
|/ / /
* / / Bump version for next release cycleAldo Cortesi2015-11-071-1/+1
|/ /
* | Bump version, update CONTRIBUTORS, CHANGELOGAldo Cortesi2015-11-063-25/+85
| |
* | Adjust pyinstaller spec pathsAldo Cortesi2015-11-062-2/+2
| |
* | Catch and ignore thread errors on exitAldo Cortesi2015-11-061-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-copyMaximilian Hils2015-11-051-2/+2
|\ \ | | | | | | fix copy to clipboard command when copying content
| * | fix copy to clipboard command when copying contentMarcelo Glezer2015-11-051-2/+2
|/ /
* | Merge pull request #809 from zbuc/pfctl_errhandlingMaximilian Hils2015-11-041-2/+11
|\ \ | |/ |/| Better error handling/reporting for pfctl failures on OS X
| * PR 809 make code more pythonicChris Czub2015-11-041-2/+3
| |
| * Declare & define insufficient_privChris Czub2015-10-291-0/+1
| |