aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove redundant __getslice__ from TransformGeneratorShadab Zafar2016-06-021-4/+0
|
* Py3: Return bytes from FileGeneratorShadab Zafar2016-06-022-9/+11
| | | | and use __getitem__ instead of __getslice__
* Py3: Return bytes from RandomGeneratorShadab Zafar2016-06-022-16/+24
| | | | and use __getitem__ rather than __getslice__
* Make Travis behaveAldo Cortesi2016-06-011-1/+6
|
* Ditch IRC Travis notifications, try to fix Slack Travis notificationsAldo Cortesi2016-06-011-10/+1
|
* Remove downloads for nowAldo Cortesi2016-06-011-5/+1
| | | | Fixes #1185
* Un-break mitmproxy consoleAldo Cortesi2016-06-011-1/+1
|
* Merge pull request #1183 from mitmproxy/module-importsAldo Cortesi2016-06-0166-504/+618
|\ | | | | use module-level imports only
| * Fix test suiteAldo Cortesi2016-06-013-12/+14
| |
| * Fix lint harderAldo Cortesi2016-06-011-9/+9
| |
| * Merge branch 'module-imports' of github.com:mitmproxy/mitmproxy into ↵Aldo Cortesi2016-06-012-18/+15
| |\ | | | | | | | | | module-imports
| | * fix importsMaximilian Hils2016-05-312-16/+13
| | |
| | * fix PIL importMaximilian Hils2016-05-311-2/+2
| | |
| * | Satisfy lintAldo Cortesi2016-06-015-6/+8
| |/
| * use module-level imports onlyMaximilian Hils2016-05-3166-488/+601
| |
* | Merge pull request #1182 from cortesi/netlibimportsMaximilian Hils2016-05-3121-170/+172
|\ \ | | | | | | Reorganise netlib imports according to Google Style Guide
| * | Reorganise netlib imports according to Google Style GuideAldo Cortesi2016-06-0121-170/+172
| | |
* | | It's text markup language, Jim, but not as we know itAldo Cortesi2016-06-011-3/+3
|/ /
* | Merge remote-tracking branch 'upstream/master'Aldo Cortesi2016-06-018-28/+29
|\ \
| * \ Merge pull request #1180 from dufferzafar/pathod-baseMaximilian Hils2016-05-313-14/+16
| |\ \ | | |/ | |/| Python 3 - pathod.language.base
| | * Py3: Use byte literals for comparisonShadab Zafar2016-05-311-12/+12
| | |
| | * Py3: Use six.string_types instead of basestringShadab Zafar2016-05-311-1/+2
| | |
| | * Py3: Use range from six.movesShadab Zafar2016-05-311-1/+2
| | |
| * | be more strict about module namespacesMaximilian Hils2016-05-315-14/+13
| |/
* | Merge branch 'master' of github.com:cortesi/mitmproxyAldo Cortesi2016-06-0145-614/+622
|\|
| * Merge pull request #1179 from cortesi/reorgAldo Cortesi2016-05-3145-604/+587
| |\ | | | | | | Start reorganising */utils.py
| | * Fix tests harderAldo Cortesi2016-05-311-2/+2
| | |
| | * http2.frame -> http2.framereaderAldo Cortesi2016-05-314-12/+12
| | |
| | * Fix test failuresAldo Cortesi2016-05-311-1/+1
| | |
| | * Satisfy flake8Aldo Cortesi2016-05-319-2/+9
| | |
| | * Unify and make symmetric pretty_size and parse_sizeAldo Cortesi2016-05-312-21/+24
| | |
| | * Move human-friendly format functions to netlib.human, remove redundant ↵Aldo Cortesi2016-05-3117-141/+110
| | | | | | | | | | | | implementations
| | * utils.multipartdecode -> http.multipart.decodeAldo Cortesi2016-05-319-95/+101
| | | | | | | | | | | | | | | | | | also utils.parse_content_type -> http.headers.parse_content_type
| | * netlib.utils.get_header_tokens -> netlib.http1.read.get_header_tokensAldo Cortesi2016-05-314-25/+25
| | | | | | | | | | | | Placing this next to its only use.
| | * isascii is unusedAldo Cortesi2016-05-311-8/+0
| | |
| | * Module is part of the name - url.decode, not url.urldecodeAldo Cortesi2016-05-3111-42/+42
| | | | | | | | | | | | A pattern we need to use far more often in the codebase
| | * Extract url functions from netlib.utils and move to netlib.http.urlAldo Cortesi2016-05-3112-182/+186
| | |
| | * Start cleaning up netlib.utilsAldo Cortesi2016-05-3117-155/+157
| |/ | | | | | | | | - Remove http2 functions, move to http2.frame - Remove Serializable, move to netlib.basetypes
| * Merge pull request #1178 from cortesi/pseudohdrsAldo Cortesi2016-05-314-10/+35
| |\ | | | | | | Improve handling of HTTP2 pseudo-headers
| | * Extend pseudo-header treatment to :status on responsesAldo Cortesi2016-05-311-2/+6
| | |
| | * Improve handling of pseudo-headersAldo Cortesi2016-05-314-8/+29
| |/ | | | | | | | | | | | | | | | | - The canonical source for :method, :scheme and :path are the .method, .scheme and .path attributes on the request object. - These pseudo-headers are stripped after reading the request, and re-inserted just before sending. - The :authority header remains, and should be handled analagously to the Host header in HTTP1 with respect to display and user interaction.
* / Style guides in READMEAldo Cortesi2016-06-011-0/+9
|/
* Make tox run all tests for 2.7Aldo Cortesi2016-05-311-0/+5
|
* Fix test import errorAldo Cortesi2016-05-311-1/+2
|
* Merge branch 'flow-module-2' of https://github.com/mhils/mitmproxy into ↵Aldo Cortesi2016-05-3110-1282/+1295
|\ | | | | | | mhils-flow-module-2
| * tell flake8 that type-annotation imports are okayMaximilian Hils2016-05-302-3/+3
| |
| * split mitmproxy.flow into mitmproxy.flow.*Maximilian Hils2016-05-3010-1282/+1295
| |
* | activate flake8 for good!Thomas Kriechbaumer2016-05-302-2/+2
|/
* start of developing server side for options (#1155)Clemens Brunner2016-05-298-210/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added UI for options menu * update UI for options menu * update UI for options v2 * update UI for options v2 * added new btn class * little changes * little changes * merge * deleted branch * change menu button class * added option route + added very incomplete handler class * moved options to settings * added toggleinputbutton * changed options menu * added option for stream large bodies, but no working * added option for stream large bodies, but no working
* Satisfy flake8Aldo Cortesi2016-05-303-7/+7
|