Maximilian Hils
c9240812d9
fix #468
2015-02-08 13:24:32 +01:00
michaeljau
b39ea74bb6
Update inlinescripts.html
...
I updated the certutils.SSLCert reference from "libmproxy.certutils.SSLCert" to "netlib.certutils.SSLCert".
2015-01-07 22:20:05 +08:00
Maximilian Hils
c152e5da1a
we do not support https2http in upstream proxy mode
2015-01-01 22:07:49 +01:00
Aldo Cortesi
84f57a2832
Adjust how doc rendering uses mitmproxy source location
...
We now make sure our imports come from here too, and that we have mod cons like
tilde expansion in the env variable.
2014-12-28 23:16:50 +13:00
Aldo Cortesi
d33d125214
Documentation for config files
2014-12-28 22:35:14 +13:00
Maximilian Hils
3e63107e94
web: integrate filter docs
2014-12-26 03:10:24 +01:00
Maximilian Hils
4767b83726
fix gzipped body edit
2014-12-23 23:14:55 +01:00
Maximilian Hils
ffb95a1db7
fix #304
2014-12-09 00:01:01 +01:00
Maximilian Hils
8cbb67ac70
docs++
2014-11-13 23:03:06 +01:00
Aldo Cortesi
e732771c1c
We don't need requests for mitmproxy
2014-11-05 09:57:09 +13:00
Maximilian Hils
77c9f64526
Merge branch 'master' of github.com:mitmproxy/mitmproxy
...
Conflicts:
doc-src/modes.html
2014-10-23 16:17:03 +02:00
Maximilian Hils
4bf07d8aa5
fix typo
2014-10-23 16:15:38 +02:00
Maximilian Hils
bbee391a47
update proxy modes diagrams
2014-10-23 16:14:04 +02:00
Aldo Cortesi
6bed076460
Document http2https and https2http
2014-10-23 16:13:03 +13:00
Aldo Cortesi
6aa05df944
Correct docs - we no longer support change of basic proxy mode in the console app
2014-10-23 15:50:43 +13:00
Aldo Cortesi
32127f80e2
More refactoring of installation docs
...
- Make it clear that README.md only has the hacking installation
instructions
- Beef up install.html
2014-10-23 15:43:06 +13:00
Aldo Cortesi
5aace7eed8
Keep sidebar ordering alphabetical, add SOCKS documentation
2014-10-23 15:05:01 +13:00
Aldo Cortesi
4da90724a0
First redraft of modes documentation
2014-10-23 12:56:31 +13:00
Aldo Cortesi
05590cf6c2
Documentation re-org
...
- No longer using README.md in the rendered documentation.
- Rendered doc instrutions are now for the released version of
mitmproxy, with dev install instructions in the README.md
2014-10-23 09:44:47 +13:00
Maximilian Hils
3848a27d31
fix #378
2014-10-22 13:59:47 +02:00
Maximilian Hils
e114858438
add generic tcp proxying, fix #374
2014-10-18 18:29:35 +02:00
Maximilian Hils
80af3589e2
docs: make sure that inline script devs don't miss the examples
2014-09-14 15:22:24 +02:00
Aldo Cortesi
e5412e9dd9
Docs stub for Unbuntu, restore executable flag on binaries.
2014-09-09 17:57:39 +12:00
Maximilian Hils
7ea8d3ff35
add note about icmp redirects, fix #255
2014-09-08 18:35:52 +02:00
Maximilian Hils
6dbe431c5e
document --ignore, fix #350
2014-09-08 13:41:25 +02:00
Maximilian Hils
b6986b8999
add mitm.it error site
2014-09-07 13:44:32 +02:00
Aldo Cortesi
bf5fef1e0b
Merge pull request #347 from mitmproxy/issue_341
...
Remove BackReferenceMixin
2014-09-07 13:04:18 +12:00
Maximilian Hils
c1438050ed
docs: mitmproxy now displays the reverse proxy server unless --host is specified, which comes with a pretty big warning itself
2014-09-07 00:59:40 +02:00
Maximilian Hils
78a44c5199
add docs on proxy modes
2014-09-07 00:42:25 +02:00
Maximilian Hils
fdd7b2f108
Merge branch 'issue_341' into server_change_api
2014-09-06 12:43:32 +02:00
Maximilian Hils
5d7cabcbfa
add architecture illustration
2014-09-05 20:14:44 +02:00
Maximilian Hils
2a6337343a
update docs, mostly revert 2f44b26b4c
2014-09-05 15:16:20 +02:00
Maximilian Hils
c6911a4158
docs: add docs for script args, fix #293
2014-08-07 01:30:47 +02:00
Maximilian Hils
74b801ba08
docs: suggest to use inline scripts rather than libmproxy
2014-08-07 00:55:42 +02:00
Maximilian Hils
e9401a2123
Merge branch 'stream'
...
Conflicts:
libmproxy/protocol/http.py
2014-07-31 22:29:13 +02:00
Maximilian Hils
f5fb1138fd
add proxy modes illustrations, refs #258
2014-07-31 02:01:13 +02:00
Maximilian Hils
7b2cfc831d
docs++
2014-07-25 19:31:12 +02:00
Brad Peabody
a1fa34e61c
response streaming doc
2014-07-24 19:11:16 -07:00
Maximilian Hils
24759daf46
update firefox cert install docs
2014-04-10 13:31:54 +02:00
Maximilian Hils
a66913d4a3
forward proxy -> upstream proxy
2014-03-14 00:02:00 +01:00
Maximilian Hils
b59013f6e3
Merge branch 'absolutely_relative_proxying'
2014-03-10 17:02:09 +01:00
Maximilian Hils
9cc10630c8
update docs, fix #215
2014-03-10 17:01:30 +01:00
Maximilian Hils
fe58c1c6eb
add advanced proxying options, add SSL-terminating capability to mitmproxy
2014-03-10 05:11:51 +01:00
Bennett Blodinger
8d57ef3c64
Update webapp.html
...
Add notice about data compression proxies
2014-03-08 20:43:39 -05:00
Maximilian Hils
1e3e0dd127
merge master
2014-01-28 17:29:28 +01:00
Aldo Cortesi
e5d2829364
docs: fix spacing of page headers
2014-01-28 15:19:53 +13:00
Aldo Cortesi
f3369529ab
Adjust docs for web app certificate installation.
2014-01-28 13:24:11 +13:00
Aldo Cortesi
784f411273
Instructions for adding mitmproxy certificates to the Java trust store.
...
Fixes #146
2014-01-27 14:45:20 +13:00
Aldo Cortesi
332eb67dfe
Android doc update.
2014-01-27 14:17:16 +13:00
Aldo Cortesi
f47d89ff4e
Revert "Move the doc tree out into its own repo."
...
This reverts commit 8f88fcedd6
.
2014-01-27 14:16:23 +13:00
Maximilian Hils
94e530ec4f
merge master
2014-01-22 16:01:31 +01:00
Aldo Cortesi
8f88fcedd6
Move the doc tree out into its own repo.
2014-01-22 13:33:02 +13:00
Aldo Cortesi
453075c77a
Doc and readme tweaks.
2014-01-19 18:08:50 +13:00
Aldo Cortesi
dc59325329
Refactor docs to define nav sidebar in only one place.
2014-01-19 17:40:26 +13:00
Aldo Cortesi
64be9b1a8a
Optionally take the mitmproxy path for doc rendering from a env variable.
2014-01-19 13:52:45 +13:00
Maximilian Hils
0b4ad05e02
merge master
2014-01-18 17:25:59 +01:00
Maximilian Hils
779e303dfe
fix syntax highlighting for countershape urls by using different quotes
2014-01-14 17:58:42 +01:00
Maximilian Hils
92966e7c48
add tutorial for transparent proxying, other minor docs improvements
2014-01-14 17:47:33 +01:00
Maximilian Hils
4637d467c0
Delete ~$$proxy-flowchart.~vsdx
2014-01-07 02:30:04 +01:00
Maximilian Hils
ea2f17680b
continue work on the proxyhandler
2014-01-07 02:29:10 +01:00
Maximilian Hils
b34ad82b52
first steps on tcp proxying
2014-01-05 01:03:55 +01:00
Maximilian Hils
e643759ef6
merge smurfix/fix2, add serverconnect hook docs, adjust tests
2013-12-16 22:10:06 +01:00
Maximilian Hils
605950bfdf
add @concurrent decorator for inline scripts, fixes #176
2013-12-15 02:43:16 +01:00
Maximilian Hils
4a32a65e0e
change certificate path for android, fix #171
2013-12-12 03:40:23 +01:00
James Billingham
3481c54d02
Added small note of file format
2013-12-11 13:11:19 +00:00
Maximilian Hils
fb985b8b87
Merge remote-tracking branch 'origin/master'
2013-12-11 14:05:18 +01:00
Maximilian Hils
e99eaa3a19
add documentation on how to use custom certificates
2013-12-11 14:04:45 +01:00
Aldo Cortesi
1bbeace350
Bump version
2013-12-10 22:23:38 +13:00
Aldo Cortesi
3a1d85ab18
Merge pull request #134 from mhils/scripts_improvements
...
Support multiple scripts and script arguments. refs #76
2013-12-08 01:14:12 -08:00
Aldo Cortesi
925eaa9343
Add a note to the docs about pf redirection of traffic from the host itself.
2013-12-08 21:38:53 +13:00
joebowbeer
00a000091e
Update android.html
...
Make the sdcard path in the text consistent with the screen shot (android-shellwgetmitmproxyca.png).
/sdcard/Download (singular) is the correct path.
2013-10-18 22:58:06 -07:00
Aldo Cortesi
826a1fdaa2
Minor adjustment for website docs pages.
2013-06-16 16:59:28 +12:00
Aldo Cortesi
db43f1ffcc
Version bump, doc extension, URLs to github.com/mitmproxy/*
2013-06-16 13:59:01 +12:00
Aldo Cortesi
bef5662365
Merge pull request #119 from jasonanovak/ViewDocumentation
...
Documentation for adding a new content viewer / View class
2013-06-15 15:53:49 -07:00
Maximilian Hils
2b4af8d475
add support for multiple scripts and script arguments. refs #76
2013-06-13 16:09:38 +02:00
Aldo Cortesi
2dfff2a75f
Styling.
2013-05-15 09:23:25 +12:00
Aldo Cortesi
36b07264f0
Mods to "How mitmproxy works"
2013-05-14 22:44:11 +12:00
Aldo Cortesi
b5cf3b4f74
README, Linux transparent mode docs, requirements additions.
2013-05-14 09:12:26 +12:00
Aldo Cortesi
98b860b0f7
Adapt docs for website embedding.
2013-04-30 09:12:06 +12:00
Jason A. Novak
bfb3828f37
Finalizing documentation
2013-04-21 14:30:30 -05:00
Jason A. Novak
208204d33a
Further cleanup of documentation
2013-04-21 14:28:00 -05:00
Jason A. Novak
d48d3d4eb3
More documentation cleanup and formatting
2013-04-21 14:20:51 -05:00
Jason A. Novak
1400880d58
More documentation
2013-04-21 13:58:08 -05:00
Jason A. Novak
e951b86c21
More documentation
2013-04-21 13:36:05 -05:00
Jason A. Novak
52a4a8bbde
Continue work on documentation of adding views
2013-04-21 12:40:35 -05:00
Jason A. Novak
0ad505ed7d
Begin work on documenting adding a new view
2013-04-21 12:40:03 -05:00
Aldo Cortesi
ca9c60d2eb
Docs.
2013-04-05 11:55:28 +13:00
Aldo Cortesi
6614498744
Update styling, GameCenter highscore tutorial.
2013-03-18 08:36:56 +13:00
Aldo Cortesi
87f76bb62b
Add filter to mitmdump examples.
2013-03-17 10:50:47 +13:00
Aldo Cortesi
55ff7e8387
Update Android cert install documents.
2013-03-17 10:44:42 +13:00
Aldo Cortesi
b6727bf7d2
Add instructions for installing the CA in the IOS Simulator.
2013-03-17 10:35:40 +13:00
Aldo Cortesi
cfb5ba89ce
Introduce a filtered flow writer, and use it in dump.py
...
Fixes #104
2013-03-14 09:19:43 +13:00
Aldo Cortesi
c34d1e3de6
Docs, examples.
2013-03-11 11:49:36 +13:00
Aldo Cortesi
5ceef16486
Expand "How mitmproxy works". Clean up some un-needed sections.
2013-03-10 17:09:40 +13:00
Aldo Cortesi
64285140f9
Test a difficult-to-trigger IOError, fix cert generation in test suite.
2013-02-24 11:34:01 +13:00
Andy Smith
fb7526fc4f
fix some syntax / formatting in the docs
2013-01-11 15:05:40 -06:00
Aldo Cortesi
f5e49ef598
First draft of "How mitmproxy works", a complete guide to the mechanics of the proxy process
2013-01-03 17:26:59 +13:00
Aldo Cortesi
04552375a9
Docs: remove proxydroid instructions from Android.
...
The "official way" is now to just use transparent mode.
2013-01-03 08:30:22 +13:00
Aldo Cortesi
101f92b256
Docs: move features into their own directory
2013-01-03 08:25:24 +13:00
Aldo Cortesi
f578d68e55
Docs: Set Headers
2013-01-03 08:20:51 +13:00