aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Collapse)AuthorAgeFilesLines
* fix webapp on WindowsMaximilian Hils2015-03-191-16/+20
| | | | | - the p12 file needs a ".p12" extension. simply naming the file "p12" isn't sufficient
* fixes crash pressing 'c':client-replay in mitmproxyMarcelo Glezer2015-03-171-1/+1
|
* add table sortMaximilian Hils2015-03-172-56/+196
|
* web: smaller changesMaximilian Hils2015-03-151-54/+33
|
* Merge remote-tracking branch 'onlywade/master'Maximilian Hils2015-03-155-11/+36
|\ | | | | | | | | | | Conflicts: libmproxy/console/__init__.py libmproxy/console/flowlist.py
| * Adding a server replay option to ignore host when searching for matching ↵Wade Catron2015-03-085-11/+38
| | | | | | | | requests
* | mitmdump: improve request printingMaximilian Hils2015-03-151-9/+14
| |
* | mitmdump: decode flow before printingMaximilian Hils2015-03-151-48/+40
| |
* | Indentation, style, whitespaceAldo Cortesi2015-03-134-40/+128
| |
* | Remove compatibility shim used to interop with older versions of UrwidAldo Cortesi2015-03-135-57/+35
| |
* | Formatting and whitespaceAldo Cortesi2015-03-133-21/+46
| |
* | Style & whitespaceAldo Cortesi2015-03-131-18/+35
| |
* | Integrate Urwid's MainLoop in console mitmproxyAldo Cortesi2015-03-131-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 specifiedAldo Cortesi2015-03-121-1/+1
| |
* | improve source map generationMaximilian Hils2015-03-111-466/+550
| |
* | Merge remote-tracking branch 'suyash/mitmweb-add-sourcemap-generation'Maximilian Hils2015-03-071-1/+3
|\ \ | |/ |/|
| * add sourcemap generation for scripts-app-dev taskSuyash2015-03-071-1/+3
| |
* | adjust to changed netlib apiMaximilian Hils2015-03-071-1/+1
|/
* Merge remote-tracking branch 'legend/master'Maximilian Hils2015-03-061-6/+18
|\ | | | | | | | | Conflicts: libmproxy/web/static/app.js
| * another clean up for #503 #504Legend Tang2015-03-061-3/+6
| |
| * clean up for #503 #504Legend Tang2015-03-061-5/+5
| |
| * Replace `addListener` method with multiple bindings, fix for #503 504Legend Tang2015-03-061-4/+13
| |
* | fix #506Legend Tang2015-03-061-11/+13
|/
* clean up web buildsMaximilian Hils2015-03-0518-8844/+11111
|
* Minor refactor to PR #496Tarashish Mishra2015-03-042-11/+13
|
* sorted timing information by timestampMarcelo Glezer2015-03-031-21/+18
|
* removed unused parameterMarcelo Glezer2015-03-031-1/+1
|
* minor refactorMarcelo Glezer2015-03-031-5/+4
|
* added timing information to FlowDetailViewMarcelo Glezer2015-03-031-8/+32
|
* fixed formatting and added a 'test' (sort of)Marcelo Glezer2015-03-022-18/+12
|
* #487 added microsecond support to format_timestamp and used in ↵Marcelo Glezer2015-03-022-10/+19
| | | | FlowDetailView. Still WIP.
* Merge pull request #489 from tekii/feature-487Maximilian Hils2015-03-022-8/+18
|\ | | | | added time elapsed between request sent and response received
| * changes requested by @mhilsMarcelo Glezer2015-03-011-9/+2
| |
| * added to flowlist / flowdetail time elapsed between request sent and ↵Marcelo Glezer2015-02-262-1/+18
| | | | | | | | response received
* | do some housekeepingMaximilian Hils2015-03-022-39/+39
| |
* | Update Server.py to fix SNI handlingelitest2015-03-021-1/+1
| | | | | | Forgot to change ciphers->client_ciphers.
* | Update Config.py to clarify help messageselitest2015-03-011-2/+2
| |
* | Update config.pyelitest2015-03-011-1/+1
| |
* | specified cipher_list in a few more locations, added a missing commaJim Shaver2015-03-012-3/+5
| |
* | Update Server.py to improve cipher selectionelitest2015-02-281-1/+2
| | | | | | Differentiated client ciphers and added server ciphers.
* | Update Config.py to improve cipher selectionelitest2015-02-281-5/+11
| | | | | | added support for specifying cipher suites on both sides of the proxy instead of just the one.
* | fix #319Maximilian Hils2015-02-272-10/+14
| |
* | Merge remote-tracking branch 'sakurai/feature/issue319'Maximilian Hils2015-02-271-1/+6
|\ \
| * | Correct typo; https://github.com/mitmproxy/mitmproxy/issues/319Youhei Sakurai2015-02-271-1/+1
| | |
| * | Change from checking __call__ to using callable;Youhei Sakurai2015-02-271-1/+1
| | | | | | | | | https://github.com/mitmproxy/mitmproxy/issues/319
| * | Maybe it should work; https://github.com/mitmproxy/mitmproxy/issues/319Youhei Sakurai2015-02-271-1/+6
| |/
* | always include SNI as SAN entryMaximilian Hils2015-02-271-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/mitmproxyMaximilian Hils2015-02-275-45/+233
|\|
| * added sni and ssl_established=true in ServerConnection. removed check for ↵Marcelo Glezer2015-02-122-5/+4
| | | | | | | | None value of server_conn in http.py
| * less is moreMarcelo Glezer2015-02-121-3/+1
| |