Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix webapp on Windows | Maximilian Hils | 2015-03-19 | 1 | -16/+20 |
| | | | | | - the p12 file needs a ".p12" extension. simply naming the file "p12" isn't sufficient | ||||
* | fixes crash pressing 'c':client-replay in mitmproxy | Marcelo Glezer | 2015-03-17 | 1 | -1/+1 |
| | |||||
* | add table sort | Maximilian Hils | 2015-03-17 | 2 | -56/+196 |
| | |||||
* | web: smaller changes | Maximilian Hils | 2015-03-15 | 1 | -54/+33 |
| | |||||
* | Merge remote-tracking branch 'onlywade/master' | Maximilian Hils | 2015-03-15 | 5 | -11/+36 |
|\ | | | | | | | | | | | Conflicts: libmproxy/console/__init__.py libmproxy/console/flowlist.py | ||||
| * | Adding a server replay option to ignore host when searching for matching ↵ | Wade Catron | 2015-03-08 | 5 | -11/+38 |
| | | | | | | | | requests | ||||
* | | mitmdump: improve request printing | Maximilian Hils | 2015-03-15 | 1 | -9/+14 |
| | | |||||
* | | mitmdump: decode flow before printing | Maximilian Hils | 2015-03-15 | 1 | -48/+40 |
| | | |||||
* | | Indentation, style, whitespace | Aldo Cortesi | 2015-03-13 | 4 | -40/+128 |
| | | |||||
* | | Remove compatibility shim used to interop with older versions of Urwid | Aldo Cortesi | 2015-03-13 | 5 | -57/+35 |
| | | |||||
* | | Formatting and whitespace | Aldo Cortesi | 2015-03-13 | 3 | -21/+46 |
| | | |||||
* | | Style & whitespace | Aldo Cortesi | 2015-03-13 | 1 | -18/+35 |
| | | |||||
* | | Integrate Urwid's MainLoop in console mitmproxy | Aldo Cortesi | 2015-03-13 | 1 | -191/+191 |
| | | | | | | | | | | | | | | Urwid's method for accumulating multi-character escape codes is now tied up with its main loop, which means we can't avoid it. This commit fixes a range of issues (like escape not working to exit editable fields), and also improves responsiveness. | ||||
* | | Better error when invalid palette is specified | Aldo Cortesi | 2015-03-12 | 1 | -1/+1 |
| | | |||||
* | | improve source map generation | Maximilian Hils | 2015-03-11 | 1 | -466/+550 |
| | | |||||
* | | Merge remote-tracking branch 'suyash/mitmweb-add-sourcemap-generation' | Maximilian Hils | 2015-03-07 | 1 | -1/+3 |
|\ \ | |/ |/| | |||||
| * | add sourcemap generation for scripts-app-dev task | Suyash | 2015-03-07 | 1 | -1/+3 |
| | | |||||
* | | adjust to changed netlib api | Maximilian Hils | 2015-03-07 | 1 | -1/+1 |
|/ | |||||
* | Merge remote-tracking branch 'legend/master' | Maximilian Hils | 2015-03-06 | 1 | -6/+18 |
|\ | | | | | | | | | Conflicts: libmproxy/web/static/app.js | ||||
| * | another clean up for #503 #504 | Legend Tang | 2015-03-06 | 1 | -3/+6 |
| | | |||||
| * | clean up for #503 #504 | Legend Tang | 2015-03-06 | 1 | -5/+5 |
| | | |||||
| * | Replace `addListener` method with multiple bindings, fix for #503 504 | Legend Tang | 2015-03-06 | 1 | -4/+13 |
| | | |||||
* | | fix #506 | Legend Tang | 2015-03-06 | 1 | -11/+13 |
|/ | |||||
* | clean up web builds | Maximilian Hils | 2015-03-05 | 18 | -8844/+11111 |
| | |||||
* | Minor refactor to PR #496 | Tarashish Mishra | 2015-03-04 | 2 | -11/+13 |
| | |||||
* | sorted timing information by timestamp | Marcelo Glezer | 2015-03-03 | 1 | -21/+18 |
| | |||||
* | removed unused parameter | Marcelo Glezer | 2015-03-03 | 1 | -1/+1 |
| | |||||
* | minor refactor | Marcelo Glezer | 2015-03-03 | 1 | -5/+4 |
| | |||||
* | added timing information to FlowDetailView | Marcelo Glezer | 2015-03-03 | 1 | -8/+32 |
| | |||||
* | fixed formatting and added a 'test' (sort of) | Marcelo Glezer | 2015-03-02 | 2 | -18/+12 |
| | |||||
* | #487 added microsecond support to format_timestamp and used in ↵ | Marcelo Glezer | 2015-03-02 | 2 | -10/+19 |
| | | | | FlowDetailView. Still WIP. | ||||
* | Merge pull request #489 from tekii/feature-487 | Maximilian Hils | 2015-03-02 | 2 | -8/+18 |
|\ | | | | | added time elapsed between request sent and response received | ||||
| * | changes requested by @mhils | Marcelo Glezer | 2015-03-01 | 1 | -9/+2 |
| | | |||||
| * | added to flowlist / flowdetail time elapsed between request sent and ↵ | Marcelo Glezer | 2015-02-26 | 2 | -1/+18 |
| | | | | | | | | response received | ||||
* | | do some housekeeping | Maximilian Hils | 2015-03-02 | 2 | -39/+39 |
| | | |||||
* | | Update Server.py to fix SNI handling | elitest | 2015-03-02 | 1 | -1/+1 |
| | | | | | | Forgot to change ciphers->client_ciphers. | ||||
* | | Update Config.py to clarify help messages | elitest | 2015-03-01 | 1 | -2/+2 |
| | | |||||
* | | Update config.py | elitest | 2015-03-01 | 1 | -1/+1 |
| | | |||||
* | | specified cipher_list in a few more locations, added a missing comma | Jim Shaver | 2015-03-01 | 2 | -3/+5 |
| | | |||||
* | | Update Server.py to improve cipher selection | elitest | 2015-02-28 | 1 | -1/+2 |
| | | | | | | Differentiated client ciphers and added server ciphers. | ||||
* | | Update Config.py to improve cipher selection | elitest | 2015-02-28 | 1 | -5/+11 |
| | | | | | | added support for specifying cipher suites on both sides of the proxy instead of just the one. | ||||
* | | fix #319 | Maximilian Hils | 2015-02-27 | 2 | -10/+14 |
| | | |||||
* | | Merge remote-tracking branch 'sakurai/feature/issue319' | Maximilian Hils | 2015-02-27 | 1 | -1/+6 |
|\ \ | |||||
| * | | Correct typo; https://github.com/mitmproxy/mitmproxy/issues/319 | Youhei Sakurai | 2015-02-27 | 1 | -1/+1 |
| | | | |||||
| * | | Change from checking __call__ to using callable; | Youhei Sakurai | 2015-02-27 | 1 | -1/+1 |
| | | | | | | | | | https://github.com/mitmproxy/mitmproxy/issues/319 | ||||
| * | | Maybe it should work; https://github.com/mitmproxy/mitmproxy/issues/319 | Youhei Sakurai | 2015-02-27 | 1 | -1/+6 |
| |/ | |||||
* | | always include SNI as SAN entry | Maximilian Hils | 2015-02-27 | 1 | -3/+4 |
| | | | | | | | | | | | | To be as robust as possible, we include the SNI value always as a Subject Alternative Name. Second, we make sure that the server address is in the list as well. | ||||
* | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-02-27 | 5 | -45/+233 |
|\| | |||||
| * | added sni and ssl_established=true in ServerConnection. removed check for ↵ | Marcelo Glezer | 2015-02-12 | 2 | -5/+4 |
| | | | | | | | | None value of server_conn in http.py | ||||
| * | less is more | Marcelo Glezer | 2015-02-12 | 1 | -3/+1 |
| | |