aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* move bin into release, update rtoolMaximilian Hils2016-02-1814-23/+8
|
* Merge pull request #950 from Kriechi/renameAldo Cortesi2016-02-17285-346/+341
|\ | | | | Rename lib folders
| * remove test/ from py.test commandsThomas Kriechbaumer2016-02-162-3/+3
| |
| * fix minor thingsThomas Kriechbaumer2016-02-166-7/+7
| |
| * move py.test options to ini-fileThomas Kriechbaumer2016-02-163-3/+6
| |
| * move tservers helperThomas Kriechbaumer2016-02-165-33/+35
| |
| * rename ProxTest -> ProxyTestThomas Kriechbaumer2016-02-165-48/+48
| |
| * fix all libpathod->pathod referencesThomas Kriechbaumer2016-02-1637-71/+63
| |
| * fix all libmproxy->mitmproxy referencesThomas Kriechbaumer2016-02-1669-177/+175
| |
| * rename mitmproxy source directoryThomas Kriechbaumer2016-02-16126-0/+0
| |
| * rename pathod source directoryThomas Kriechbaumer2016-02-1659-0/+0
|/
* Merge pull request #949 from fimad/masterAldo Cortesi2016-02-161-4/+4
|\ | | | | Fix failing unit tests caused by a69d223b
| * Fix failing unit tests caused by a69d223bWill Coster2016-02-151-4/+4
|/
* fix wheel creation, re-add MANIFEST.inMaximilian Hils2016-02-165-6/+7
|
* travis: remove sdist buildsMaximilian Hils2016-02-161-1/+1
|
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-02-162-5/+13
|\
| * Merge pull request #948 from fimad/masterMaximilian Hils2016-02-162-5/+13
| |\ | | | | | | Preserve host header when modifying request path
| | * Preserve host header when modifying request pathWill Coster2016-02-152-5/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Currently the path_components and query setters of the Request object use the url setter under the hood. The url setter updates all parts of the URL including the host. If the host header and the host in the request URL are different (as is common when making HTTPS requests) then the host header will be updated to the value in the URL as a result of modifying the path. This change fixes this problem by modifying the query and path_components setters to not use the url setter and instead directly update the path field.
* / temporarily silence flaky testsMaximilian Hils2016-02-162-2/+5
|/
* remove MANIFEST.in, move Dockerfile to rootMaximilian Hils2016-02-165-17/+0
|
* update mitmproxy changelogMaximilian Hils2016-02-161-0/+23
|
* rtool: remove support for source distributionsMaximilian Hils2016-02-161-40/+22
|
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-02-164-1/+1
|\
| * Satisfy pip constraints, set +x on executablesAldo Cortesi2016-02-164-1/+1
| |
* | fix release tool, refs #947Maximilian Hils2016-02-1611-101/+84
|/
* update shield.io badgesMaximilian Hils2016-02-152-3/+3
|
* Merge pull request #937 from mhils/single-repoMaximilian Hils2016-02-15627-139/+20169
|\ | | | | Combine mitmproxy, pathod and netlib in a single repo.
| * use own shields instance, update pathod readmeMaximilian Hils2016-02-157-118/+90
| |
| * update README.rst, minor fixesMaximilian Hils2016-02-156-104/+168
| |
| * fix ALPN checksMaximilian Hils2016-02-156-7/+7
| |
| * fix appveyor, re-introduce requirements.txtMaximilian Hils2016-02-158-21/+31
| |
| * adjust travisMaximilian Hils2016-02-155-72/+24
| |
| * fix testsMaximilian Hils2016-02-153-6/+12
| |
| * move tests into shared folderMaximilian Hils2016-02-15170-0/+0
| |
| * dev -> dev.shMaximilian Hils2016-02-151-0/+0
| |
| * merge metadata filesMaximilian Hils2016-02-1539-420/+46
| |
| * add releaseMaximilian Hils2016-02-156-0/+625
| |\
| | * make sure that we don't have build race conditionsMaximilian Hils2016-02-141-0/+2
| | |
| | * Merge branch 'master' of https://github.com/mitmproxy/releaseMaximilian Hils2016-02-141-2/+1
| | |\
| | | * don't print while displaying a progress barMaximilian Hils2016-02-141-2/+1
| | | |
| | * | fix minor bugsMaximilian Hils2016-02-141-5/+5
| | |/
| | * more verbose sftp outputMaximilian Hils2016-02-121-3/+4
| | |
| | * automatically delete old snapshotsMaximilian Hils2016-02-121-0/+6
| | |
| | * use public key crypto for snapshot uploadMaximilian Hils2016-02-112-4/+77
| | |
| | * Merge branch 'master' of https://github.com/mitmproxy/releaseMaximilian Hils2016-02-110-0/+0
| | |\
| | | * Merge pull request #2 from mitmproxy/requires-io-masterMaximilian Hils2016-02-061-1/+1
| | | |\ | | | | | | | | | | [requires.io] dependency update on master branch
| | | | * [requires.io] dependency updaterequires.io2016-02-061-1/+1
| | | |/
| | * / add snapshot upload to rtoolMaximilian Hils2016-02-112-54/+146
| | |/
| | * update dependenciesMaximilian Hils2016-02-061-1/+1
| | |
| | * update dependenciesMaximilian Hils2016-02-062-5/+5
| | |