aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #509 from suyash/mitmweb-add-sourcemap-generationMaximilian Hils2015-03-082-10/+18
|\ | | | | add sourcemap generation for scripts-app-dev task
| * add sourcemap generation for scripts-app-dev taskSuyash2015-03-072-10/+18
| |
* | adjust to changed netlib apiMaximilian Hils2015-03-071-1/+1
|/
* Merge remote-tracking branch 'legend/master'Maximilian Hils2015-03-064-11/+35
|\ | | | | | | | | Conflicts: libmproxy/web/static/app.js
| * another clean up for #503 #504Legend Tang2015-03-063-5/+11
| |
| * clean up for #503 #504Legend Tang2015-03-062-9/+9
| |
| * Replace `addListener` method with multiple bindings, fix for #503 504Legend Tang2015-03-062-7/+25
| |
| * Revert "revert to custom EventEmitter, workaround for #504"Legend Tang2015-03-062-32/+5
| | | | | | | | This reverts commit fa8fc64ce0170b029410600af20b25c8160fe5c6.
| * revert to custom EventEmitter, workaround for #504Legend Tang2015-03-062-5/+32
| | | | | | | | It's an EventEmitter issue.
* | add mitmweb executableMaximilian Hils2015-03-061-2/+3
| |
* | Merge pull request #507 from legendtang/fix_flowactionsMaximilian Hils2015-03-063-19/+23
|\ \ | |/ |/| fix #506
| * fix #506Legend Tang2015-03-063-19/+23
|/
* clean up web buildsMaximilian Hils2015-03-0522-8881/+11140
|
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-03-043-13/+40
|\
| * Merge pull request #500 from sunu/masterMaximilian Hils2015-03-043-13/+40
| |\ | | | | | | improvement to PR #496
| | * 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-023-18/+14
| | |
| | * #487 added microsecond support to format_timestamp and used in ↵Marcelo Glezer2015-03-022-10/+19
| | | | | | | | | | | | FlowDetailView. Still WIP.
| | * Merge pull request #2 from mitmproxy/masterMarcelo Glezer2015-03-0218-51/+220
| | |\ | | |/ | |/| update to mitmproxy/master
* | | update docsMaximilian Hils2015-03-041-2/+6
| | |
* | | Documentation for the client side certificate is addedsentient072015-03-031-1/+4
|/ /
* | Merge pull request #489 from tekii/feature-487Maximilian Hils2015-03-023-8/+31
|\ \ | | | | | | 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-263-1/+31
| |/ | | | | | | response received
* | do some housekeepingMaximilian Hils2015-03-022-39/+39
| |
* | Merge pull request #493 from elitest/masterMaximilian Hils2015-03-022-10/+19
|\ \ | | | | | | Adding support for server facing SSL cipher suite specification
| * | 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
| | |
| * | Un-executable'd setup.pyJim Shaver2015-03-011-0/+0
| | |
| * | specified cipher_list in a few more locations, added a missing commaJim Shaver2015-03-013-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.
* | | Merge pull request #492 from mitmproxy/entrypointsMaximilian Hils2015-03-021-1/+7
|\ \ \ | |/ / |/| | use entry_points for Windows support
| * | use entry_points for Windows supportMaximilian Hils2015-02-271-1/+7
| | |
* | | SSLKEYLOGFILE docsMaximilian Hils2015-02-283-0/+10
| | |
* | | fix #319Maximilian Hils2015-02-276-22/+43
| | |
* | | Merge remote-tracking branch 'sakurai/feature/issue319'Maximilian Hils2015-02-273-1/+28
|\ \ \ | |/ / |/| |
| * | Correct typo; https://github.com/mitmproxy/mitmproxy/issues/319Youhei Sakurai2015-02-271-1/+1
| | |
| * | Change from checking __call__ to using callable;Youhei Sakurai2015-02-272-2/+2
| | | | | | | | | https://github.com/mitmproxy/mitmproxy/issues/319
| * | Modify example to notify incompatibility with --stream SIZE command lineYouhei Sakurai2015-02-271-0/+8
| | | | | | | | | option; https://github.com/mitmproxy/mitmproxy/issues/319
| * | Maybe it should work; https://github.com/mitmproxy/mitmproxy/issues/319Youhei Sakurai2015-02-273-1/+20
| |/
* | add example inline script for dns spoofing, refs #486Maximilian Hils2015-02-272-0/+36
| |
* | 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-276-46/+235
|\|
| * Merge pull request #474 from tekii/feature-426Maximilian Hils2015-02-135-14/+70
| |\ | | | | | | Feature 426
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-10 06:47:40 +0000