Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Fix test suite | Aldo Cortesi | 2016-06-01 | 3 | -12/+14 | |
| | | | ||||||
| * | | Fix lint harder | Aldo Cortesi | 2016-06-01 | 1 | -9/+9 | |
| | | | ||||||
| * | | Merge branch 'module-imports' of github.com:mitmproxy/mitmproxy into ↵ | Aldo Cortesi | 2016-06-01 | 2 | -18/+15 | |
| |\ \ | | | | | | | | | | | | | module-imports | |||||
| | * | | fix imports | Maximilian Hils | 2016-05-31 | 2 | -16/+13 | |
| | | | | ||||||
| | * | | fix PIL import | Maximilian Hils | 2016-05-31 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Satisfy lint | Aldo Cortesi | 2016-06-01 | 5 | -6/+8 | |
| |/ / | ||||||
| * | | use module-level imports only | Maximilian Hils | 2016-05-31 | 66 | -488/+601 | |
| | | | ||||||
* | | | Merge pull request #1182 from cortesi/netlibimports | Maximilian Hils | 2016-05-31 | 21 | -170/+172 | |
|\ \ \ | | | | | | | | | Reorganise netlib imports according to Google Style Guide | |||||
| * | | | Reorganise netlib imports according to Google Style Guide | Aldo Cortesi | 2016-06-01 | 21 | -170/+172 | |
| | | | | ||||||
* | | | | It's text markup language, Jim, but not as we know it | Aldo Cortesi | 2016-06-01 | 1 | -3/+3 | |
|/ / / | ||||||
* | | | Merge remote-tracking branch 'upstream/master' | Aldo Cortesi | 2016-06-01 | 8 | -28/+29 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #1180 from dufferzafar/pathod-base | Maximilian Hils | 2016-05-31 | 3 | -14/+16 | |
| |\ \ \ | | |/ / | |/| | | Python 3 - pathod.language.base | |||||
| | * | | Py3: Use byte literals for comparison | Shadab Zafar | 2016-05-31 | 1 | -12/+12 | |
| | | | | ||||||
| | * | | Py3: Use six.string_types instead of basestring | Shadab Zafar | 2016-05-31 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | Py3: Use range from six.moves | Shadab Zafar | 2016-05-31 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | be more strict about module namespaces | Maximilian Hils | 2016-05-31 | 5 | -14/+13 | |
| |/ / | ||||||
* | | | Merge branch 'master' of github.com:cortesi/mitmproxy | Aldo Cortesi | 2016-06-01 | 45 | -614/+622 | |
|\| | | ||||||
| * | | Merge pull request #1179 from cortesi/reorg | Aldo Cortesi | 2016-05-31 | 45 | -604/+587 | |
| |\ \ | | | | | | | | | Start reorganising */utils.py | |||||
| | * | | Fix tests harder | Aldo Cortesi | 2016-05-31 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | http2.frame -> http2.framereader | Aldo Cortesi | 2016-05-31 | 4 | -12/+12 | |
| | | | | ||||||
| | * | | Fix test failures | Aldo Cortesi | 2016-05-31 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Satisfy flake8 | Aldo Cortesi | 2016-05-31 | 9 | -2/+9 | |
| | | | | ||||||
| | * | | Unify and make symmetric pretty_size and parse_size | Aldo Cortesi | 2016-05-31 | 2 | -21/+24 | |
| | | | | ||||||
| | * | | Move human-friendly format functions to netlib.human, remove redundant ↵ | Aldo Cortesi | 2016-05-31 | 17 | -141/+110 | |
| | | | | | | | | | | | | | | | | implementations | |||||
| | * | | utils.multipartdecode -> http.multipart.decode | Aldo Cortesi | 2016-05-31 | 9 | -95/+101 | |
| | | | | | | | | | | | | | | | | | | | | | | | | also utils.parse_content_type -> http.headers.parse_content_type | |||||
| | * | | netlib.utils.get_header_tokens -> netlib.http1.read.get_header_tokens | Aldo Cortesi | 2016-05-31 | 4 | -25/+25 | |
| | | | | | | | | | | | | | | | | Placing this next to its only use. | |||||
| | * | | isascii is unused | Aldo Cortesi | 2016-05-31 | 1 | -8/+0 | |
| | | | | ||||||
| | * | | Module is part of the name - url.decode, not url.urldecode | Aldo Cortesi | 2016-05-31 | 11 | -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.url | Aldo Cortesi | 2016-05-31 | 12 | -182/+186 | |
| | | | | ||||||
| | * | | Start cleaning up netlib.utils | Aldo Cortesi | 2016-05-31 | 17 | -155/+157 | |
| |/ / | | | | | | | | | | | | | - Remove http2 functions, move to http2.frame - Remove Serializable, move to netlib.basetypes | |||||
| * | | Merge pull request #1178 from cortesi/pseudohdrs | Aldo Cortesi | 2016-05-31 | 4 | -10/+35 | |
| |\ \ | | | | | | | | | Improve handling of HTTP2 pseudo-headers | |||||
| | * | | Extend pseudo-header treatment to :status on responses | Aldo Cortesi | 2016-05-31 | 1 | -2/+6 | |
| | | | | ||||||
| | * | | Improve handling of pseudo-headers | Aldo Cortesi | 2016-05-31 | 4 | -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 README | Aldo Cortesi | 2016-06-01 | 1 | -0/+9 | |
|/ / | ||||||
* | | Make tox run all tests for 2.7 | Aldo Cortesi | 2016-05-31 | 1 | -0/+5 | |
| | | ||||||
* | | Fix test import error | Aldo Cortesi | 2016-05-31 | 1 | -1/+2 | |
| | | ||||||
* | | Merge branch 'flow-module-2' of https://github.com/mhils/mitmproxy into ↵ | Aldo Cortesi | 2016-05-31 | 10 | -1282/+1295 | |
|\ \ | | | | | | | | | | mhils-flow-module-2 | |||||
| * | | tell flake8 that type-annotation imports are okay | Maximilian Hils | 2016-05-30 | 2 | -3/+3 | |
| | | | ||||||
| * | | split mitmproxy.flow into mitmproxy.flow.* | Maximilian Hils | 2016-05-30 | 10 | -1282/+1295 | |
| | | | ||||||
* | | | activate flake8 for good! | Thomas Kriechbaumer | 2016-05-30 | 2 | -2/+2 | |
|/ / | ||||||
* | | start of developing server side for options (#1155) | Clemens Brunner | 2016-05-29 | 8 | -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 flake8 | Aldo Cortesi | 2016-05-30 | 3 | -7/+7 | |
| | | ||||||
* | | Merge branch 'tox' of https://github.com/Kriechi/mitmproxy into Kriechi-tox | Aldo Cortesi | 2016-05-30 | 3 | -0/+13 | |
|\ \ | ||||||
| * | | add tox | Thomas Kriechbaumer | 2016-05-29 | 3 | -0/+13 | |
| | | | ||||||
* | | | fix | Thomas Kriechbaumer | 2016-05-29 | 1 | -1/+1 | |
| | | | ||||||
* | | | fix windows paths | Thomas Kriechbaumer | 2016-05-29 | 1 | -2/+2 | |
|/ / | ||||||
* | | fix har test | Thomas Kriechbaumer | 2016-05-29 | 1 | -5/+5 | |
| | | ||||||
* | | fix bytes vs. str | Thomas Kriechbaumer | 2016-05-29 | 1 | -2/+2 | |
| | | ||||||
* | | fix headers order | Thomas Kriechbaumer | 2016-05-29 | 2 | -3/+3 | |
| | | ||||||
* | | handle_* -> * leftovers | Maximilian Hils | 2016-05-29 | 5 | -11/+14 | |
| | |