aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* disable TCP support for nowThomas Kriechbaumer2016-11-231-3/+4
* websocket: add testsThomas Kriechbaumer2016-11-235-4/+37
* websocket: change cmdline optionThomas Kriechbaumer2016-11-234-13/+14
* websocket: add event documentationThomas Kriechbaumer2016-11-231-12/+46
* add WebSocket flows and messagesThomas Kriechbaumer2016-11-238-54/+238
* rename WebSocket{s,} protocolThomas Kriechbaumer2016-11-239-45/+46
* make the new mypy release happyMaximilian Hils2016-11-233-0/+11
* Update README.mdMaximilian Hils2016-11-221-0/+1
* Update README.mdMaximilian Hils2016-11-221-0/+1
* remove mitmweb authMaximilian Hils2016-11-223-18/+1
* don't set an empty ALPN, refs #1772Maximilian Hils2016-11-221-1/+1
* Merge pull request #1769 from mhils/update-pydivertMaximilian Hils2016-11-212-42/+44
|\
| * update pydivert, fix #1749Maximilian Hils2016-11-212-42/+44
|/
* Descriptive error message for SSL context initialization failure (#1767)Yoginski2016-11-212-1/+35
* remove stickycookie exampleMaximilian Hils2016-11-212-43/+0
* Merge pull request #1768 from mhils/organize-examplesMaximilian Hils2016-11-2143-268/+196
|\
| * organize examplesMaximilian Hils2016-11-2143-268/+196
|/
* rewrite absolute-form HTTP requests to relative form, fix #1759 (#1765)Maximilian Hils2016-11-203-0/+22
* Merge pull request #1766 from Kriechi/fix-test-raceThomas Kriechbaumer2016-11-201-5/+15
|\
| * tests: fix race conditionThomas Kriechbaumer2016-11-201-5/+15
* | handle SIGINT with a quit prompt (#1760)Edgar Boda-Majer2016-11-201-9/+18
|/
* Merge pull request #1751 from dwfreed/patch-1Thomas Kriechbaumer2016-11-192-3/+6
|\
| * proxy/protocol/base: Allow spoofing fixed sourceDoug Freed2016-11-182-3/+6
* | Merge pull request #1757 from fotinakis/masterThomas Kriechbaumer2016-11-191-1/+1
|\ \ | |/ |/|
| * Remove dead run_scripthooks example reference.Mike Fotinakis2016-11-171-1/+1
* | Merge pull request #1753 from mitmproxy/update-dependenciesThomas Kriechbaumer2016-11-1814-3/+20
|\ \ | |/ |/|
| * lint!Maximilian Hils2016-11-1813-1/+18
| * update dependenciesMaximilian Hils2016-11-181-2/+2
|/
* Merge pull request #1729 from mhils/mitmweb-fixesMaximilian Hils2016-11-169-36/+76
|\
| * fix type checksMaximilian Hils2016-11-161-2/+2
| * mitmweb: start browser on startupMaximilian Hils2016-11-161-3/+34
| * minor fixesMaximilian Hils2016-11-168-31/+40
* | Merge pull request #1752 from dwfreed/patch-2Maximilian Hils2016-11-161-1/+1
|\ \ | |/ |/|
| * setup.py: adjust mypy-lang dependency for semverDoug Freed2016-11-161-1/+1
|/
* Merge pull request #1742 from dwfreed/patch-2Maximilian Hils2016-11-163-1/+9
|\
| * proxy/protocol/base: use upstream_bind_addressDoug Freed2016-11-141-1/+1
| * tools/cmdline: add upstream bind address optionDoug Freed2016-11-141-0/+6
| * options: add upstream_bind_addressDoug Freed2016-11-141-0/+2
* | Merge pull request #1748 from Kriechi/better-onboardingThomas Kriechbaumer2016-11-161-1/+21
|\ \
| * | add macOS/OSX installation instructions to onboarding pageThomas Kriechbaumer2016-11-161-1/+21
* | | Merge pull request #1743 from cortesi/viewsigAldo Cortesi2016-11-154-44/+56
|\ \ \ | |_|/ |/| |
| * | addons.view: clarify modification eventsAldo Cortesi2016-11-154-44/+56
|/ /
* | Merge pull request #1740 from pquentin/masterAldo Cortesi2016-11-141-2/+2
|\ \ | |/ |/|
| * docs: Fix typosQuentin Pradet2016-11-141-2/+2
|/
* Merge pull request #1738 from Kriechi/fix-1737Aldo Cortesi2016-11-141-1/+11
|\
| * restrict ALPN offers if host changesThomas Kriechbaumer2016-11-131-1/+11
* | Merge pull request #1720 from cortesi/proxyrefactorAldo Cortesi2016-11-1424-768/+860
|\ \ | |/ |/|
| * addons.proxyauth: out with the old, in with the newAldo Cortesi2016-11-1312-453/+63
| * addons.proxyauth: complete and testAldo Cortesi2016-11-132-16/+205
| * stub out proxyauth addonAldo Cortesi2016-11-132-0/+121