aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'absolutely_relative_proxying'Maximilian Hils2014-03-1018-233/+260
|\
| * update docs, fix #215Maximilian Hils2014-03-105-27/+29
| |
| * add advanced proxying options, add SSL-terminating capability to mitmproxyMaximilian Hils2014-03-1014-164/+182
| |
| * lay the foundations for --(in|out)(abs|rel) command line switches, as ↵Maximilian Hils2014-03-106-61/+68
| | | | | | | | proposed in https://groups.google.com/forum/#!topic/mitmproxy/nApno2TXS0c
* | Merge pull request #231 from benwa/patch-1Aldo Cortesi2014-03-101-0/+3
|\ \ | | | | | | Update webapp.html
| * | Update webapp.htmlBennett Blodinger2014-03-081-0/+3
| | | | | | | | | Add notice about data compression proxies
* | | Merge pull request #232 from benwa/patch-2Aldo Cortesi2014-03-101-6/+0
|\ \ \ | | | | | | | | Update layout.html
| * | | Update layout.htmlBennett Blodinger2014-03-081-6/+0
| |/ / | | | | | | Remove unnecessary menu button on mobile
* | | Merge pull request #233 from mitmproxy/untangle_circular_dependenciesAldo Cortesi2014-03-1023-668/+690
|\ \ \ | |/ / |/| / | |/ Untangle circular dependencies
| * fix mentions of CONTENT_MISSING in libmproxy.consoleMaximilian Hils2014-03-092-5/+7
| |
| * finish proxy.py split upMaximilian Hils2014-03-0922-288/+289
| |
| * split up proxy.pyMaximilian Hils2014-03-0913-188/+207
|/
* fix windows tests, include improvements from 0.10.1Maximilian Hils2014-03-084-5/+8
|
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-03-0815-227/+384
|\
| * Revert to old cert names, use a subdir for test conf dir.Aldo Cortesi2014-03-073-5/+5
| |
| * Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-03-071-1/+0
| |\
| | * Merge pull request #230 from sergeychipiga/fix/remove-redundant-codelineMaximilian Hils2014-03-051-1/+0
| | |\ | | | | | | | | remove redundant codeline
| | | * remove redundant codelineSergey Chipiga2014-03-051-1/+0
| | |/
| * / Use the right conf dir...Aldo Cortesi2014-03-071-1/+1
| |/
| * Much more sophisticated cert handlingAldo Cortesi2014-03-057-80/+63
| | | | | | | | | | | | - Specify per-domain certificates and keys - Certs are no longer regenerated for SANs - And more. :)
| * Minor cleanups.Aldo Cortesi2014-03-026-16/+13
| |
| * Cipher specification.Aldo Cortesi2014-03-021-5/+20
| |
| * Improve explicit certificate specificationAldo Cortesi2014-03-024-16/+36
| | | | | | | | | | - Support cert/key in the same PEM file - Rationalize arguments, expand tests, clean up a bit
| * Update for pathod.SSLOptions changes.Aldo Cortesi2014-03-021-1/+1
| |
| * Adapt for new pathod and netlib APIs.Aldo Cortesi2014-03-024-9/+12
| |
| * Merge pull request #223 from droope/improve-backwards-searchAldo Cortesi2014-02-263-141/+281
| |\ | | | | | | Improve search to also search backwards.
| | * add helpful messages on wrapPedro Worcel2014-02-222-12/+26
| | |
| | * fix the wrapping on backward searchesPedro Worcel2014-02-222-16/+45
| | |
| | * add docsPedro Worcel2014-02-221-1/+2
| | |
| | * add multi-line support to backwards searchPedro Worcel2014-02-222-15/+41
| | |
| | * add multi-line supportPedro Worcel2014-02-222-3/+25
| | |
| | * add basic backwards searchPedro Worcel2014-02-223-122/+170
| |/
* / combine asterisk-form and origin-form into relative formMaximilian Hils2014-03-083-18/+15
|/
* fix bug: ensure that server connection is present for tcp connectionsMaximilian Hils2014-02-171-0/+1
|
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2014-02-171-1/+1
|\
| * Bump versionMaximilian Hils2014-02-111-1/+1
| | | | | | Do it now already so that mitmproxy will warn the user if netlib is not from master.
* | fix commentsMaximilian Hils2014-02-092-6/+7
|/
* Fix flow initialization order errorAldo Cortesi2014-02-084-15/+16
| | | | Resolves #210
* Better response when mitmproxy crashes.Aldo Cortesi2014-02-082-3/+8
|
* Merge pull request #208 from kmike/pillow-setuppyAldo Cortesi2014-02-081-1/+1
|\ | | | | Remove upper bound for Pillow in setup.py
| * remove upper bound for Pillow in setup.pyMikhail Korobov2014-02-051-1/+1
| |
* | Cleanup: fix unit tests, simpler app test, remove print statementsAldo Cortesi2014-02-089-85/+76
| |
* | fix testsMaximilian Hils2014-02-071-0/+3
| |
* | add tests for reconnect to upstream proxy, ensure that server_reconnect is ↵Maximilian Hils2014-02-075-41/+137
| | | | | | | | always hooked
* | Achievement Unlocked: Proxy ChainMaximilian Hils2014-02-076-9/+78
| |
* | fix race conditions in test suiteMaximilian Hils2014-02-073-9/+20
| |
* | coverage++Maximilian Hils2014-02-077-31/+147
| |
* | test libmproxy.app, increase coverageMaximilian Hils2014-02-077-32/+97
| |
* | finalize mergeMaximilian Hils2014-02-062-4/+4
| |
* | add functionality to change the destination serverMaximilian Hils2014-02-063-25/+55
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 14:43:21 +0000