aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * upstream_proxy_auth -> upstream_authAldo Cortesi2016-11-134-8/+8
| * Complete upstream authentication moduleAldo Cortesi2016-11-135-11/+62
| * Refine handling of HTTP CONNECTAldo Cortesi2016-11-124-100/+124
| * Add the http_connect event for HTTP CONNECT requestsAldo Cortesi2016-11-124-20/+44
| * Upstream proxy auth to addonAldo Cortesi2016-11-127-44/+86
| * Add HTTPFlow.mode to record the HTTP proxy layer modeAldo Cortesi2016-11-123-4/+13
| * Use an enum for http protocol modesAldo Cortesi2016-11-122-21/+23
| * Remove promotion to raw TCP based on heuristicsAldo Cortesi2016-11-122-11/+2
| * Test failure during 100-continueAldo Cortesi2016-11-123-26/+40
| * Bug: ask requestheaders before request body is readAldo Cortesi2016-11-122-2/+51
| * proxy.protocol.http: cleanups, extract request validationAldo Cortesi2016-11-121-28/+35
| * Remove unused protocol attribute on connections.Aldo Cortesi2016-11-121-2/+0
| * proxy.protocol.http: flatten for refactoringAldo Cortesi2016-11-121-189/+150
|/
* Merge pull request #1723 from Kriechi/http2-connsMaximilian Hils2016-11-091-47/+48
|\
| * http2: move h2 connection objectThomas Kriechbaumer2016-11-051-47/+48
* | Merge pull request #1725 from mhils/mitmwebMaximilian Hils2016-11-0930-62130/+1079
|\ \
| * | mitmweb: minor fixesMaximilian Hils2016-11-095-7/+37
| * | web: update static assetsMaximilian Hils2016-11-093-61000/+495
| * | web: fix header updateMaximilian Hils2016-11-091-26/+27
| * | web: simplify flow storageMaximilian Hils2016-11-0817-573/+363
| * | clean up mitmwebMaximilian Hils2016-11-0821-3059/+2692
| * | fix mitmwebMaximilian Hils2016-11-082-3/+3
| |/
* | Merge pull request #1724 from phackt/masterMaximilian Hils2016-11-091-0/+5
|\ \ | |/ |/|
| * explain host=pretty_host assignmentMaximilian Hils2016-11-091-0/+4
| * fix SNI for transparent mode - #1638phackt2016-11-081-0/+1
|/
* http2: add push-promise metadata testThomas Kriechbaumer2016-11-051-0/+6
* Merge pull request #1716 from cortesi/deprecated2Aldo Cortesi2016-11-041-11/+0
|\
| * Remove sticky[auth,cookie] from http objectsAldo Cortesi2016-11-041-11/+0
* | Merge pull request #1715 from cortesi/deprecatedAldo Cortesi2016-11-046-42/+10
|\|
| * Remove deprecated interfacesAldo Cortesi2016-11-046-42/+10
* | Merge pull request #1714 from cortesi/justno2Aldo Cortesi2016-11-0414-45/+45
|\|
| * Let's not over-ride __bool__ on connection objectsAldo Cortesi2016-11-0412-21/+21
| * script.concurrent: tests to taddonsAldo Cortesi2016-11-042-24/+24
|/
* Merge pull request #1711 from navinpai/1541Aldo Cortesi2016-11-041-1/+3
|\
| * Allow forever wait at end of message #1541Naveen Pai2016-11-041-1/+3
* | Merge pull request #1712 from navinpai/docsAldo Cortesi2016-11-041-1/+4
|\ \ | |/ |/|
| * [MINOR] fix link in documentationNaveen Pai2016-11-041-1/+4
|/
* Merge pull request #1709 from cortesi/taddons4Aldo Cortesi2016-11-049-178/+214
|\
| * addons: convert last of the test suite to taddonsAldo Cortesi2016-11-045-94/+92
| * addons.setheaders: fix configure bug, tests to taddonsAldo Cortesi2016-11-042-56/+54
| * addons.view: test suite to 100%Aldo Cortesi2016-11-042-28/+68
|/
* Merge pull request #1708 from cortesi/taddons3Aldo Cortesi2016-11-045-18/+67
|\
| * addons.view: test improvementsAldo Cortesi2016-11-032-2/+52