aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* Update png.py. Stop reading after IENDUjjwal Verma2017-06-061-3/+5
* check tty after options parsingThomas Kriechbaumer2017-06-042-5/+6
* check for tty when running mitmproxyThomas Kriechbaumer2017-06-041-1/+7
* Merge pull request #2367 from mhils/issue-2329Thomas Kriechbaumer2017-06-023-1/+14
|\
| * minor improvementsMaximilian Hils2017-06-022-0/+5
| * fix #2329Maximilian Hils2017-06-011-1/+9
* | Fixes #2230 (#2361)Ujjwal Verma2017-06-021-1/+6
|/
* sync with PyWBXMLDecoder master branch (#2366)David Shaw2017-06-016-12/+12
* Increase test coverageUjjwal Verma2017-05-311-4/+4
* Merge pull request #2358 from mhils/make-mypy-great-againMaximilian Hils2017-05-272-13/+17
|\
| * fix mypy annotationsMaximilian Hils2017-05-262-13/+17
* | http2: prevent KeyErrorThomas Kriechbaumer2017-05-261-8/+9
* | fail-safe flowfilterThomas Kriechbaumer2017-05-261-0/+2
|/
* cleanup old tls_parserThomas Kriechbaumer2017-05-261-208/+0
* Merge pull request #2353 from ujjwal96/tls-parserThomas Kriechbaumer2017-05-264-12/+300
|\
| * Added ksy file and updated make.shUjjwal Verma2017-05-262-0/+140
| * Using kaitai struct to parse tls client helloUjjwal Verma2017-05-262-12/+160
* | fix openssl cipher_list bytes/str deprecationThomas Kriechbaumer2017-05-241-1/+1
|/
* cleanupThomas Kriechbaumer2017-05-241-1/+3
* fix various fd/socket leaksThomas Kriechbaumer2017-05-242-5/+8
* proxy tests: fix leaking socketsThomas Kriechbaumer2017-05-242-12/+14
* fix array.{fromstring,tostring} deprecation warningThomas Kriechbaumer2017-05-241-2/+2
* close existing server_conn before replacing itThomas Kriechbaumer2017-05-242-1/+7
* TCP IPv6: fix leaking socketsThomas Kriechbaumer2017-05-241-0/+2
* Merge pull request #2191 from LuD1161/Issue#2139Maximilian Hils2017-05-221-1/+7
|\
| * Update options.pyThomas Kriechbaumer2017-05-191-2/+5
| * Added the level definition that can be usedLuD11612017-03-201-1/+4
* | Increase net.tcp.py coverage (#2336)Ujjwal Verma2017-05-171-7/+7
* | alpn_select_callback must be a callableThomas Kriechbaumer2017-05-171-1/+3
* | fix pragmasThomas Kriechbaumer2017-05-171-1/+1
* | net.tcp: server should be in shut-down state before startAldo Cortesi2017-05-141-0/+1
* | Changes in setup.cfgUjjwal Verma2017-05-121-1/+1
* | Increase io.compat coverageUjjwal Verma2017-05-121-0/+17
* | net.http.url.py changesUjjwal Verma2017-05-121-21/+3
* | Fixed LDAP Auth (#2333)charlesdhdt2017-05-122-21/+31
* | fix type annotationMaximilian Hils2017-05-111-2/+1
* | Handle head request on onboarding app: Fix #2324 (#2325)Ujjwal Verma2017-05-091-0/+25
* | Change to only Apps & VPNRitiek Malhotra2017-05-081-1/+1
* | Add instructions for Windows and AndroidRitiek Malhotra2017-05-071-6/+27
* | Add apple info from docsRitiek Malhotra2017-05-071-4/+6
* | Add dynamic apple instructionsRitiek Malhotra2017-05-071-19/+35
* | Merge pull request #2286 from charlesdhdt/masterMaximilian Hils2017-05-042-4/+39
|\ \
| * | Added ldap mock testCharles d'Hondt2017-05-041-1/+0
| * | lint checksCharles d'Hondt2017-05-021-4/+4
| * | Added ldapsss vefCharles d'Hondt2017-04-281-1/+5
| * | fixCharles d'Hondt2017-04-281-1/+1
| * | Added LDAP AuthCharles d'Hondt2017-04-282-3/+35
* | | fix #2310Maximilian Hils2017-05-031-1/+2
* | | console: add a two-pane layoutAldo Cortesi2017-05-037-77/+194
* | | console: Make EventLog its own control, bind to "E"Aldo Cortesi2017-05-025-99/+77