From 77bb0b74ed9cf156490f52a162a4d1856694db4f Mon Sep 17 00:00:00 2001
From: Youhei Sakurai <sakurai.youhei@gmail.com>
Date: Fri, 27 Feb 2015 02:44:47 +0900
Subject: Maybe it should work;
 https://github.com/mitmproxy/mitmproxy/issues/319

---
 doc-src/features/responsestreaming.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc-src')

diff --git a/doc-src/features/responsestreaming.html b/doc-src/features/responsestreaming.html
index 47fafef7..59847c8f 100644
--- a/doc-src/features/responsestreaming.html
+++ b/doc-src/features/responsestreaming.html
@@ -40,6 +40,9 @@ Responses that should be tagged for streaming by setting their respective .strea
 
 $!example("examples/stream.py")!$
 
+In addition, if the .stream attribute is set to callable(), .stream will work as a hook in chunk data processing.
+
+$!example("examples/stream_modify.py")!$
 
 <h2>Implementation Details</h2>
 
-- 
cgit v1.2.3


From 10f81e596bc0db37c62c0326ae6f7d3891f7756c Mon Sep 17 00:00:00 2001
From: Youhei Sakurai <sakurai.youhei@gmail.com>
Date: Fri, 27 Feb 2015 10:15:07 +0900
Subject: Change from checking __call__ to using callable;
 https://github.com/mitmproxy/mitmproxy/issues/319

---
 doc-src/features/responsestreaming.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc-src')

diff --git a/doc-src/features/responsestreaming.html b/doc-src/features/responsestreaming.html
index 59847c8f..20785269 100644
--- a/doc-src/features/responsestreaming.html
+++ b/doc-src/features/responsestreaming.html
@@ -40,7 +40,7 @@ Responses that should be tagged for streaming by setting their respective .strea
 
 $!example("examples/stream.py")!$
 
-In addition, if the .stream attribute is set to callable(), .stream will work as a hook in chunk data processing.
+In addition, if the .stream attribute is callable, .stream will work as a hook in chunk data processing.
 
 $!example("examples/stream_modify.py")!$
 
-- 
cgit v1.2.3


From e1b6cf940146ca91c6f583a3333b4b50b72875bb Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Fri, 27 Feb 2015 15:24:27 +0100
Subject: fix #319

---
 doc-src/features/responsestreaming.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'doc-src')

diff --git a/doc-src/features/responsestreaming.html b/doc-src/features/responsestreaming.html
index 20785269..6511e913 100644
--- a/doc-src/features/responsestreaming.html
+++ b/doc-src/features/responsestreaming.html
@@ -40,10 +40,6 @@ Responses that should be tagged for streaming by setting their respective .strea
 
 $!example("examples/stream.py")!$
 
-In addition, if the .stream attribute is callable, .stream will work as a hook in chunk data processing.
-
-$!example("examples/stream_modify.py")!$
-
 <h2>Implementation Details</h2>
 
 When response streaming is enabled, portions of the code which would have otherwise performed changes
@@ -52,6 +48,11 @@ on the response body will see an empty response body instead (<code>libmproxy.pr
 Streamed responses are usually sent in chunks of 4096 bytes. If the response is sent with a <code>Transfer-Encoding:
     chunked</code> header, the response will be streamed one chunk at a time.
 
+<h2>Modifying streamed data</h2>
+If the <code>.stream</code> attribute is callable, .stream will work as a hook in chunk data processing.
+
+$!example("examples/stream_modify.py")!$
+
 ### See Also
 
 - [Ignore Domains](@!urlTo("passthrough.html")!@)
-- 
cgit v1.2.3


From eec4c539f2f6b8124ab92d6087afb228874a479e Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Sat, 28 Feb 2015 03:35:28 +0100
Subject: SSLKEYLOGFILE docs

---
 doc-src/_nav.html              | 1 +
 doc-src/dev/index.py           | 1 +
 doc-src/dev/sslkeylogfile.html | 8 ++++++++
 3 files changed, 10 insertions(+)
 create mode 100644 doc-src/dev/sslkeylogfile.html

(limited to 'doc-src')

diff --git a/doc-src/_nav.html b/doc-src/_nav.html
index 6c3afbe1..69175c0c 100644
--- a/doc-src/_nav.html
+++ b/doc-src/_nav.html
@@ -56,4 +56,5 @@
     <li class="nav-header">Hacking</li>
         $!nav("dev/architecture.html", this, state)!$
         $!nav("dev/testing.html", this, state)!$
+        $!nav("dev/sslkeylogfile.html", this, state)!$
 </ul>
diff --git a/doc-src/dev/index.py b/doc-src/dev/index.py
index bb7872c7..0f2a6494 100644
--- a/doc-src/dev/index.py
+++ b/doc-src/dev/index.py
@@ -3,5 +3,6 @@ from countershape import Page
 pages = [
      Page("testing.html", "Testing"),
      Page("architecture.html", "Architecture"),
+     Page("sslkeylogfile.html", "TLS Master Secrets"),
 #    Page("addingviews.html", "Writing Content Views"),
 ]
diff --git a/doc-src/dev/sslkeylogfile.html b/doc-src/dev/sslkeylogfile.html
new file mode 100644
index 00000000..1826fc2e
--- /dev/null
+++ b/doc-src/dev/sslkeylogfile.html
@@ -0,0 +1,8 @@
+The SSL master keys can be logged by mitmproxy so that external programs can decrypt TLS connections both from and to the proxy.
+Key logging is enabled by setting the environment variable <samp>SSLKEYLOGFILE</samp> so that it points to a writable
+text file. Recent versions of WireShark can use these log files to decrypt packets.
+You can specify the key file path in WireShark via<br>
+<samp>Edit → Preferences → Protocols → SSL → (Pre)-Master-Secret log filename</samp>.
+
+ Note that <samp>SSLKEYLOGFILE</samp> is respected by other programs as well, e.g. Firefox and Chrome.
+If this creates any issues, you can set <samp>MITMPROXY_SSLKEYLOGFILE</samp> alternatively.
\ No newline at end of file
-- 
cgit v1.2.3