| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | add memoryleak debug script | Maximilian Hils | 2015-11-26 | 1 | -0/+38 |
| | | |||||
| * | fix #831 | Maximilian Hils | 2015-11-26 | 1 | -1/+1 |
| | | |||||
| * | http: catch all exceptions | Maximilian Hils | 2015-11-26 | 1 | -7/+6 |
| | | |||||
| * | simplify Client/ServerConnection.__repr__ | Maximilian Hils | 2015-11-26 | 1 | -6/+4 |
| | | |||||
| * | establish tls with client even if server connection fails | Maximilian Hils | 2015-11-26 | 1 | -2/+1 |
| | | |||||
| * | script reloader: minor fixes | Maximilian Hils | 2015-11-26 | 1 | -0/+3 |
| | | |||||
| * | travis: add OSX tests | Maximilian Hils | 2015-11-26 | 1 | -0/+10 |
| | | |||||
| * | fix #842 | Maximilian Hils | 2015-11-26 | 2 | -11/+26 |
| | | |||||
| * | skip timing tests on appveyor | Maximilian Hils | 2015-11-24 | 3 | -5/+18 |
| | | |||||
| * | disable script reloader | Maximilian Hils | 2015-11-24 | 1 | -1/+1 |
| | | | | | This currently throws some errors on OSX. | ||||
| * | Merge branch 'travis-contentviews' | Maximilian Hils | 2015-11-20 | 1 | -1/+1 |
| |\ | |||||
| | * | travis: test optional content views as well | Maximilian Hils | 2015-11-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #836 from MatthewShao/fix#835 | Maximilian Hils | 2015-11-18 | 1 | -1/+2 |
| |\ \ | | | | | | | Fix #835 , can display unicode character correctly | ||||
| | * | | fix #835 , can display unicode character correctly | Matthew Shao | 2015-11-16 | 1 | -1/+2 |
| |/ / | |||||
| * | | fix appveyor race conditions in tests | Maximilian Hils | 2015-11-14 | 1 | -6/+4 |
| | | | |||||
| * | | fix HTTPS Proxy-Authentication, refs #824 | Maximilian Hils | 2015-11-14 | 2 | -1/+7 |
| | | | |||||
| * | | finalize script reloading :tada: | Maximilian Hils | 2015-11-14 | 6 | -58/+96 |
| | | | |||||
| * | | structure libmproxy.script | Maximilian Hils | 2015-11-14 | 11 | -223/+293 |
| |\ \ | |||||
| | * | | Decouple libmproxy.script from libmproxy.flow | Matthew Shao | 2015-11-13 | 3 | -18/+25 |
| | | | | |||||
| | * | | Move the observer initalization to the constructor of Script | Matthew Shao | 2015-11-11 | 2 | -9/+9 |
| | | | | | | | | | | | | | | | | class.Should work with both mitmproxy and mitmdump now. Change the names in PEP8 style. | ||||
| | * | | Use watchdog to reload scripts automatically. | Matthew Shao | 2015-11-11 | 3 | -0/+27 |
| | | | | |||||
| * | | | minor stylistic fixes | Maximilian Hils | 2015-11-14 | 3 | -17/+16 |
| | | | | |||||
| * | | | 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 | ||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |