aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2104 from lymanZerga11/patch-2Maximilian Hils2017-03-061-1/+1
|\
| * Update flowlist.pylymanZerga112017-03-061-1/+1
* | Merge pull request #2105 from Kriechi/dev-versionMaximilian Hils2017-03-061-1/+1
|\ \ | |/ |/|
| * clearly indentify git-checkout as dev versionThomas Kriechbaumer2017-03-061-1/+1
* | Merge pull request #2082 from tarnacious/masterMaximilian Hils2017-03-041-0/+2
|\ \
| * | Call error handler and mark flow on HTTPExceptiontarnacious2017-03-011-0/+2
| |/
* | update release docsMaximilian Hils2017-03-044-16718/+18853
* | Merge pull request #2081 from s4chin/add-pretty-hostMaximilian Hils2017-03-041-0/+1
|\ \
| * | web: Fix #1888Sachin Kelkar2017-03-031-0/+1
* | | Merge branch 'master' into on-issuesNikhil Soni2017-03-0327-223/+224
|\ \ \ | | |/ | |/|
| * | http2: fix h2 header normalization test (#2080)Thomas Kriechbaumer2017-03-011-3/+0
| |/
| * Fix #2071, remove client_connect.mitmcert when dumping flow into json.Matthew Shao2017-02-271-0/+1
| * Merge pull request #2069 from JordanLoehr/iss2068Maximilian Hils2017-02-271-2/+2
| |\
| | * Added console_ prefix to options in palettepicket to resolve issue #2068Jordan Loehr2017-02-261-2/+2
| * | Merge pull request #2067 from whackashoe/fix-2065Maximilian Hils2017-02-261-1/+1
| |\ \
| | * | fix #2065 by setting correct content encoding for brotliJett2017-02-261-1/+1
| | |/
| * | do not return IP addresses in SSLCert.altnamesThomas Kriechbaumer2017-02-261-1/+2
| * | certs: coverage++Thomas Kriechbaumer2017-02-261-8/+12
| * | connections: coverage++ (#2064)Thomas Kriechbaumer2017-02-263-11/+40
| |/
| * flowfilter: coverage++Thomas Kriechbaumer2017-02-242-1/+3
| * fix constant definitionMaximilian Hils2017-02-241-4/+3
| * nuke tcp.Address and add proper IPv6 supportThomas Kriechbaumer2017-02-2421-195/+155
| * Merge pull request #2055 from Kriechi/http2-normalize-headersThomas Kriechbaumer2017-02-231-2/+0
| |\
| | * http2: normalize headers before sendingThomas Kriechbaumer2017-02-231-2/+0
| * | Merge pull request #2048 from ujjwal96/ipv6-addressesMaximilian Hils2017-02-221-2/+12
| |\ \ | | |/ | |/|
| | * minor changesMaximilian Hils2017-02-211-3/+6
| | * Absolute IPv6 addresses supportedUjjwal Verma2017-02-201-1/+8
* | | Updates help msg and docs for --keep-host-headerNikhil Soni2017-03-031-1/+1
* | | Adds --keep-host-header option (#2039)Nikhil Soni2017-02-223-1/+9
|/ /
* | update compatThomas Kriechbaumer2017-02-211-1/+1
* | minor adjustmentsMaximilian Hils2017-02-212-4/+3
* | store generated cert for each flowDaniel Lenski2017-02-214-0/+8
* | lint!Thomas Kriechbaumer2017-02-211-0/+2
* | bump dev versionThomas Kriechbaumer2017-02-212-1/+5
* | Merge pull request #2051 from MatthewShao/fix-#1928-@concurrent-in-OOPMaximilian Hils2017-02-211-1/+5
|\ \
| * | docs++Maximilian Hils2017-02-211-0/+1
| * | Fix #1928, @concurrent decorator now works for class methods.Matthew Shao2017-02-211-1/+4
| |/
* / update mitmweb resourcesMaximilian Hils2017-02-212-425/+743
|/
* Merge pull request #2017 from lymanZerga11/patch-1Thomas Kriechbaumer2017-02-201-3/+4
|\
| * Catch ValueErrors from url.parse()lymanZerga112017-02-121-3/+4
* | Merge pull request #2041 from krsoninikhil/debugThomas Kriechbaumer2017-02-201-1/+5
|\ \
| * | Adds PyInstaller build indicator to --version argumentNikhil Soni2017-02-181-1/+5
* | | protobuf: coverage++Thomas Kriechbaumer2017-02-192-15/+11
* | | http2: disable priority forwardingThomas Kriechbaumer2017-02-183-16/+41
* | | Merge pull request #2040 from mhils/request-host-headerMaximilian Hils2017-02-184-13/+48
|\ \ \
| * | | .headers["host"] -> .host_headerMaximilian Hils2017-02-184-14/+12
| * | | add request.host_header, fix #2036Maximilian Hils2017-02-171-0/+37
| |/ /
* | | Merge pull request #2035 from Kriechi/fix-1916Thomas Kriechbaumer2017-02-181-1/+1
|\ \ \ | |/ / |/| |
| * | fix #1916Thomas Kriechbaumer2017-02-171-1/+1
* | | Use existing urlencoding conventions when re-encoding edited form #1946 (#2022)mame822017-02-162-3/+16
|/ /