aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Merge pull request #881 from MatthewShao/Fix#846Maximilian Hils2016-01-182-14/+20
| | |\ \
| | | * | Update reloader.pyMatthew Shao2016-01-181-1/+0
| | | * | Update reloader.pyMatthew Shao2016-01-181-1/+1
| | | * | Use RegexMatchingEventHandler() instead.MatthewShao2016-01-181-17/+7
| | | * | Use PollingObserver() only on OS X.Matthew Shao2016-01-141-6/+7
| | | * | PollingObserver() fixed on Linux and OS X.Matthew Shao2016-01-121-4/+6
| | | * | Change Observer() to PollingObserver().MatthewShao2016-01-121-4/+3
| | | * | Fix observer in same dir situation.Matthew Shao2016-01-121-7/+8
| | | * | Fix script reloader on OS X.MatthewShao2016-01-122-8/+22
| | | |/
* | | / remove unnecessary source_address from proxy modesSandor Nemes2016-01-185-5/+1
|/ / /
* | | Minor aesthetic fixes.Sandor Nemes2016-01-183-7/+5
* | | Merge branch 'master' into masterSandor Nemes2016-01-172-2/+21
|\| |
| * | Merge pull request #872 from bazzinotti/inline-tcpMaximilian Hils2016-01-172-2/+21
| |\ \ | | |/ | |/|
| | * Add Inline Script Hooks to TCP modeMichael J. Bazzinotti2016-01-102-2/+21
* | | Merge branch 'master' into masterSandor Nemes2016-01-134-16/+27
|\| |
| * | remove code duplicationThomas Kriechbaumer2016-01-101-6/+6
| * | Support writing to outfile from mitmwebChris Czub2016-01-103-10/+21
* | | Fixed a problem with the bind address not being used as the source address on...Sandor Nemes2016-01-087-7/+17
|/ /
* / fix #659Maximilian Hils2016-01-021-3/+3
|/
* client-cert: Simplify and cleanupMichael J. Bazzinotti2015-12-291-5/+2
* [docs/libmproxy/test] Support single client-side cert file as argument toMichael J. Bazzinotti2015-12-283-9/+14
* Add default ciphers to avoid issue with iOS9 App Transport SecurityJorge Villacorta2015-12-111-1/+1
* TLS verification warnings write to stderrDavid Weinstein2015-12-101-1/+2
* bump versionMaximilian Hils2015-12-031-1/+1
* Revert "make setup.py wheel-ready"Maximilian Hils2015-12-031-4/+0
* make setup.py wheel-readyMaximilian Hils2015-12-031-0/+4
* flow format compat: 0.14 -> 0.15Maximilian Hils2015-12-031-2/+9
* fix #839Maximilian Hils2015-12-021-2/+4
* add import capability for old flows, fix #840Maximilian Hils2015-12-022-7/+39
* fix #847Maximilian Hils2015-11-272-3/+3
* 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
* fix #842Maximilian Hils2015-11-262-11/+26
* disable script reloaderMaximilian Hils2015-11-241-1/+1
* fix #835 , can display unicode character correctlyMatthew Shao2015-11-161-1/+2
* fix HTTPS Proxy-Authentication, refs #824Maximilian Hils2015-11-142-1/+7
* finalize script reloading :tada:Maximilian Hils2015-11-145-58/+95
* structure libmproxy.scriptMaximilian Hils2015-11-149-210/+279
|\
| * 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
| * Use watchdog to reload scripts automatically.Matthew Shao2015-11-113-0/+27
* | minor stylistic fixesMaximilian Hils2015-11-142-6/+3
* | Feedback from PR #832Chris Czub2015-11-133-84/+51
* | Add custom content view plugin support for mitmproxy/mitmdumpChris Czub2015-11-132-1/+52
* | Add new contentviews' content type mappingsChris Czub2015-11-131-0/+10
* | Add "add" ContentView method & testChris Czub2015-11-131-0/+8
|/
* fix scripteditor bugMaximilian Hils2015-11-101-0/+1