From ac32455ff3ccbfdb3e896c635f694b9d75a06bab Mon Sep 17 00:00:00 2001
From: Bo <bo@bowild.com>
Date: Mon, 31 Dec 2018 05:56:25 -0500
Subject: [PATCH] docs

---
 CHANGELOG.md            |   2 +-
 docs/0.7.x/fio.html     | 106 ++++++++++++++++++++++++++++++++++------
 docs/0.7.x/fio_tls.html |  45 ++++++++++++-----
 docs/changelog.html     |  17 +++++++
 4 files changed, 142 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6cdc326..0273084c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 **BREAK**: (`fio_tls`) breaking API changes to the SSL/TLS API, adding support for password protected private key files. *Note*: The TLS API is still fragile and should only be considered stable once version 0.7.0 is released with SSL/TLS support.
 
-**Security** / **Fix**: (`http`) fixed an issue with the HTTP/1.1 parser, where maliciously crafted white-space data could cause a segmentation fault, resulting an DoS.
+**Security** / **Fix**: (`http`) fixed an issue with the HTTP/1.1 parser, where maliciously crafted white-space data could cause a segmentation fault, resulting in a potential DoS.
 
 **Fix**: (`fio`) fixed an issue exposed by implementing the TLS layer, where the highet `fd` for a connection that wasn't assigned a `protocol_s` object immediately after the connection was opened, might avoid timeout review or avoid cleanup during shutdown (which will be marked as a memory leak).
 
diff --git a/docs/0.7.x/fio.html b/docs/0.7.x/fio.html
index 91b92f8e..8743b82a 100644
--- a/docs/0.7.x/fio.html
+++ b/docs/0.7.x/fio.html
@@ -253,6 +253,9 @@ <h3 id="the-fiobj-types"><a href="/0.7.x/fiobj">The FIOBJ types</a></h3>
 <a href="#fio_rw_hook_set"><code>fio_rw_hook_set</code></a>
 </li>
 <li>
+<a href="#fio_rw_hook_replace_unsafe"><code>fio_rw_hook_replace_unsafe</code></a>
+</li>
+<li>
 <a href="#fio_default_rw_hooks"><code>FIO_DEFAULT_RW_HOOKS</code></a>
 </li>
 </ul>
@@ -488,6 +491,9 @@ <h3 id="the-fiobj-types"><a href="/0.7.x/fiobj">The FIOBJ types</a></h3>
 <a href="#fio_str_init_static"><code>FIO_STR_INIT_STATIC</code></a>
 </li>
 <li>
+<a href="#fio_str_init_static2"><code>FIO_STR_INIT_STATIC2</code></a>
+</li>
+<li>
 <a href="#fio_str_new2"><code>fio_str_new2</code></a>
 </li>
 <li>
@@ -608,6 +614,9 @@ <h3 id="the-fiobj-types"><a href="/0.7.x/fiobj">The FIOBJ types</a></h3>
 <a href="#dynamic-arrays">Dynamic Arrays</a>
 <ul>
 <li>
+<a href="#array-memory-allocation">Array Memory allocation</a>
+</li>
+<li>
 <a href="#defining-the-array">Defining the Array</a>
 <ul>
 <li>
@@ -715,6 +724,9 @@ <h3 id="the-fiobj-types"><a href="/0.7.x/fiobj">The FIOBJ types</a></h3>
 <a href="#hash-maps-sets">Hash Maps / Sets</a>
 <ul>
 <li>
+<a href="#hash-map-set-memory-allocation">Hash Map / Set Memory allocation</a>
+</li>
+<li>
 <a href="#defining-the-set-hash-map">Defining the Set / Hash Map</a>
 <ul>
 <li>
@@ -1952,6 +1964,19 @@ <h4 id="fio_rw_hook_set"><code>fio_rw_hook_set</code></h4>
 
 <p>If the function fails, than the <code>cleanup</code> callback will be called before the function returns.</p>
 
+<h4 id="fio_rw_hook_replace_unsafe"><code>fio_rw_hook_replace_unsafe</code></h4>
+<pre><code class='highlight'><span class="kt">int</span> <span class="n">fio_rw_hook_replace_unsafe</span><span class="p">(</span><span class="kt">intptr_t</span> <span class="n">uuid</span><span class="p">,</span> <span class="n">fio_rw_hook_s</span> <span class="o">*</span><span class="n">rw_hooks</span><span class="p">,</span> <span class="kt">void</span> <span class="o">*</span><span class="n">udata</span><span class="p">);</span>
+</code></pre>
+<p>Replaces an existing read/write hook with another from within a read/write hook callback.</p>
+
+<p>Returns 0 on success or -1 on error (closed / invalid <code>uuid</code>).</p>
+
+<p>Does NOT call any cleanup callbacks.</p>
+
+<p>Replaces existing <code>udata</code>. Call with the existing <code>udata</code> to keep it.</p>
+
+<p><strong>Note</strong>: this function is marked as unsafe, since it should only be called from within an existing read/write hook callback. Otherwise, data corruption might occur.</p>
+
 <h4 id="fio_default_rw_hooks"><code>FIO_DEFAULT_RW_HOOKS</code></h4>
 <pre><code class='highlight'><span class="k">extern</span> <span class="k">const</span> <span class="n">fio_rw_hook_s</span> <span class="n">FIO_DEFAULT_RW_HOOKS</span><span class="p">;</span>
 </code></pre>
@@ -2490,16 +2515,14 @@ <h4 id="fio_malloc"><code>fio_malloc</code></h4>
 
 <p>Memory is always zeroed out.</p>
 
-<p>Allocations above <code>FIO_MEMORY_BLOCK_ALLOC_LIMIT</code> (12,288 bytes when using the default 32Kb
-blocks) will be redirected to <code>mmap</code>, as if <code>fio_mmap</code> was called.</p>
+<p>Allocations above <code>FIO_MEMORY_BLOCK_ALLOC_LIMIT</code> (16Kb bytes when using the default 32Kb blocks) will be redirected to <code>mmap</code>, as if <code>fio_mmap</code> was called.</p>
 
 <h4 id="fio_calloc"><code>fio_calloc</code></h4>
 <pre><code class='highlight'><span class="kt">void</span> <span class="o">*</span><span class="n">fio_calloc</span><span class="p">(</span><span class="kt">size_t</span> <span class="n">size_per_unit</span><span class="p">,</span> <span class="kt">size_t</span> <span class="n">unit_count</span><span class="p">)</span>
 </code></pre>
 <p>Same as calling <code>fio_malloc(size_per_unit * unit_count)</code>;</p>
 
-<p>Allocations above <code>FIO_MEMORY_BLOCK_ALLOC_LIMIT</code> (12,288 bytes when using 32Kb
-blocks) will be redirected to <code>mmap</code>, as if <code>fio_mmap</code> was called.</p>
+<p>Allocations above <code>FIO_MEMORY_BLOCK_ALLOC_LIMIT</code> (16Kb bytes when using the default 32Kb blocks) will be redirected to <code>mmap</code>, as if <code>fio_mmap</code> was called.</p>
 
 <h4 id="fio_free"><code>fio_free</code></h4>
 <pre><code class='highlight'><span class="kt">void</span> <span class="n">fio_free</span><span class="p">(</span><span class="kt">void</span> <span class="o">*</span><span class="n">ptr</span><span class="p">);</span>
@@ -2700,13 +2723,19 @@ <h4 id="string-memory-allocation">String Memory Allocation</h4>
 
 <p>String memory is managed by facil.io&#39;s allocation / deallocation routines (<code>fio_malloc</code>, etc&#39;).</p>
 
-<p>To use the system&#39;s memory allocation / deallocation define <code>FIO_FORCE_MALLOC</code> as <code>1</code>. This will persist for all the types defined by <code>fio.h</code> until undefined.</p>
+<p>To use the system&#39;s memory allocation / deallocation define <code>FIO_FORCE_MALLOC_TMP</code> as <code>1</code> before including <code>fio.h</code>.</p>
+
+<p>A definition of <code>FIO_FORCE_MALLOC_TMP</code> doesn&#39;t persist, it will be cleared away once <code>fio.h</code> was included.</p>
+
+<p>A definition of <code>FIO_FORCE_MALLOC</code> will persist for all the types defined by <code>fio.h</code> until undefined but might be defined during compilation and shouldn&#39;t be manually unset.</p>
 
 <p>For example:</p>
 <pre><code class='highlight'><span class="cp">#define FIO_INCLUDE_STR 1
-#define FIO_FORCE_MALLOC 1
+#define FIO_FORCE_MALLOC_TMP 1
 #include &lt;fio.h&gt;
-#undef FIO_FORCE_MALLOC
+#ifdef FIO_FORCE_MALLOC_TMP
+#error "FIO_FORCE_MALLOC_TMP is removed after it's used."
+#undef
 </span></code></pre>
 <h4 id="fio_str_init"><code>FIO_STR_INIT</code></h4>
 <pre><code class='highlight'><span class="cp">#define FIO_STR_INIT ((fio_str_s){.data = NULL, .small = 1})
@@ -2742,9 +2771,13 @@ <h4 id="fio_str_init_static"><code>FIO_STR_INIT_STATIC</code></h4>
 <pre><code class='highlight'><span class="cp">#define FIO_STR_INIT_STATIC(buffer)                                            \
  ((fio_str_s){.data = (buffer), .len = strlen((buffer)), .dealloc = NULL})
 </span></code></pre>
-<p>This macro allows the container to be initialized with existing data, as long as it&#39;s memory was allocated using <code>fio_malloc</code>.</p>
+<p>This macro allows the container to be initialized with existing static data, that shouldn&#39;t be freed.</p>
 
-<p>The <code>capacity</code> value should exclude the NUL character (if exists).</p>
+<h4 id="fio_str_init_static2"><code>FIO_STR_INIT_STATIC2</code></h4>
+<pre><code class='highlight'><span class="cp">#define FIO_STR_INIT_STATIC2(buffer, length)                                            \
+ ((fio_str_s){.data = (buffer), .len = (length), .dealloc = NULL})
+</span></code></pre>
+<p>This macro allows the container to be initialized with existing static data, that shouldn&#39;t be freed.</p>
 
 <h4 id="fio_str_new2"><code>fio_str_new2</code></h4>
 <pre><code class='highlight'><span class="kr">inline</span> <span class="n">fio_str_s</span> <span class="o">*</span><span class="n">fio_str_new2</span><span class="p">(</span><span class="kt">void</span><span class="p">);</span>
@@ -3016,6 +3049,27 @@ <h2 id="dynamic-arrays">Dynamic Arrays</h2>
 #define FIO_ARY_DESTROY(key) fio_str_free2((key))
 #include &lt;fio.h&gt; // creates the fio_str_ary_s Array and functions
 </span></code></pre>
+<h3 id="array-memory-allocation">Array Memory allocation</h3>
+
+<p>The Array&#39;s memory is managed by facil.io&#39;s allocation / deallocation routines (<code>fio_malloc</code>, etc&#39;).</p>
+
+<p>To use the system&#39;s memory allocation / deallocation define <code>FIO_FORCE_MALLOC_TMP</code> as <code>1</code> before including <code>fio.h</code>.</p>
+
+<p>A definition of <code>FIO_FORCE_MALLOC_TMP</code> doesn&#39;t persist, it will be cleared away once <code>fio.h</code> was included.</p>
+
+<p>A definition of <code>FIO_FORCE_MALLOC</code> will persist for all the types defined by <code>fio.h</code> until undefined but might be defined during compilation and shouldn&#39;t be manually unset.</p>
+
+<p>For example:</p>
+<pre><code class='highlight'><span class="cp">#define FIO_FORCE_MALLOC_TMP 1
+#define FIO_ARY_NAME fio_int_ary
+#define FIO_ARY_TYPE int
+#include &lt;fio.h&gt; // creates the fio_int_ary_s Array and functions
+#ifdef FIO_FORCE_MALLOC_TMP
+#error "FIO_FORCE_MALLOC_TMP is removed after it's used."
+#undef
+</span></code></pre>
+<p>More flexibility (such as using a third memory allocation scheme) can be achieved using the <code>FIO_ARRAY_MALLOC</code> type macros, as detailed below.</p>
+
 <h3 id="defining-the-array">Defining the Array</h3>
 
 <h4 id="fio_ary_name"><code>FIO_ARY_NAME</code></h4>
@@ -3086,7 +3140,7 @@ <h4 id="fio_ary_malloc"><code>FIO_ARY_MALLOC</code></h4>
 
 <p>It&#39;s important to note that the default allocator <strong>must</strong> set all the allocated bytes to zero, exactly as <code>fio_malloc</code> does.</p>
 
-<p>To use the system&#39;s memory allocator (<code>calloc</code>), it&#39;s possible to define <code>FIO_FORCE_MALLOC</code> as <code>1</code>. This will persist whenever the <code>fio.h</code> header is included until unset.</p>
+<p>To use the system&#39;s memory allocation / deallocation define <code>FIO_FORCE_MALLOC_TMP</code> as <code>1</code> before including <code>fio.h</code>.</p>
 
 <h4 id="fio_ary_realloc"><code>FIO_ARY_REALLOC</code></h4>
 <pre><code class='highlight'><span class="cp">#ifndef FIO_ARY_REALLOC </span><span class="cm">/* NULL ptr indicates new allocation */</span><span class="cp">
@@ -3096,7 +3150,7 @@ <h4 id="fio_ary_realloc"><code>FIO_ARY_REALLOC</code></h4>
 </span></code></pre>
 <p>The default Array re-allocator is set to <code>fio_realloc2</code>. All bytes will be set to zero except the copied data and - in some cases, where copy alignment error occurs - the last 16 bytes.</p>
 
-<p>To use the system&#39;s memory allocator (<code>realloc</code>), it&#39;s possible to define <code>FIO_FORCE_MALLOC</code> as <code>1</code>. This will persist whenever the <code>fio.h</code> header is included until unset.</p>
+<p>To use the system&#39;s memory allocation / deallocation define <code>FIO_FORCE_MALLOC_TMP</code> as <code>1</code> before including <code>fio.h</code>.</p>
 
 <h4 id="fio_ary_dealloc"><code>FIO_ARY_DEALLOC</code></h4>
 <pre><code class='highlight'><span class="cp">#ifndef FIO_ARY_DEALLOC
@@ -3105,7 +3159,7 @@ <h4 id="fio_ary_dealloc"><code>FIO_ARY_DEALLOC</code></h4>
 </span></code></pre>
 <p>The default Array deallocator is set to <code>fio_free</code>.</p>
 
-<p>To use the system&#39;s memory deallocator (<code>free</code>), it&#39;s possible to define <code>FIO_FORCE_MALLOC</code> as <code>1</code>. This will persist whenever the <code>fio.h</code> header is included until unset.</p>
+<p>To use the system&#39;s memory allocation / deallocation define <code>FIO_FORCE_MALLOC_TMP</code> as <code>1</code> before including <code>fio.h</code>.</p>
 
 <h3 id="naming-the-array">Naming the Array</h3>
 
@@ -3304,6 +3358,28 @@ <h2 id="hash-maps-sets">Hash Maps / Sets</h2>
 </code></pre>
 <p>This can be performed a number of times, defining a different Set / Hash Map each time.</p>
 
+<h3 id="hash-map-set-memory-allocation">Hash Map / Set Memory allocation</h3>
+
+<p>The Hash Map&#39;s memory is managed by facil.io&#39;s allocation / deallocation routines (<code>fio_malloc</code>, etc&#39;).</p>
+
+<p>To use the system&#39;s memory allocation / deallocation define <code>FIO_FORCE_MALLOC_TMP</code> as <code>1</code> before including <code>fio.h</code>.</p>
+
+<p>A definition of <code>FIO_FORCE_MALLOC_TMP</code> doesn&#39;t persist, it will be cleared away once <code>fio.h</code> was included.</p>
+
+<p>A definition of <code>FIO_FORCE_MALLOC</code> will persist for all the types defined by <code>fio.h</code> until undefined but might be defined during compilation and shouldn&#39;t be manually unset.</p>
+
+<p>For example:</p>
+<pre><code class='highlight'><span class="cp">#define FIO_FORCE_MALLOC_TMP 1
+#define FIO_SET_NAME fio_str_info_set
+#define FIO_SET_OBJ_TYPE char *
+#define FIO_SET_OBJ_COMPARE(k1, k2) (!strcmp((k1), (k2)))
+#include &lt;fio.h&gt; // created the fio_str_info_set_s and functions
+#ifdef FIO_FORCE_MALLOC_TMP
+#error "FIO_FORCE_MALLOC_TMP is removed after it's used."
+#undef
+</span></code></pre>
+<p>More flexibility (such as using a third memory allocation scheme) can be achieved using the <code>FIO_SET_MALLOC</code> type macros, as detailed below.</p>
+
 <h3 id="defining-the-set-hash-map">Defining the Set / Hash Map</h3>
 
 <p>The Set&#39;s object type and behavior is controlled by the FIO_SET_OBJ_* marcos: <code>FIO_SET_OBJ_TYPE</code>, <code>FIO_SET_OBJ_COMPARE</code>, <code>FIO_SET_OBJ_COPY</code>, <code>FIO_SET_OBJ_DESTROY</code>. i.e.:</p>
@@ -3402,7 +3478,7 @@ <h4 id="fio_set_realloc"><code>FIO_SET_REALLOC</code></h4>
 
 <p>The default allocator is facil.io&#39;s <code>fio_realloc</code>.</p>
 
-<p>To use the system&#39;s memory allocator (<code>realloc</code>), it&#39;s possible to define <code>FIO_FORCE_MALLOC</code> as <code>1</code>. This will persist whenever the <code>fio.h</code> header is included until unset.</p>
+<p>To use the system&#39;s memory allocation / deallocation define <code>FIO_FORCE_MALLOC_TMP</code> as <code>1</code> before including <code>fio.h</code>.</p>
 
 <h4 id="fio_set_calloc"><code>FIO_SET_CALLOC</code></h4>
 <pre><code class='highlight'><span class="cp">#define FIO_SET_CALLOC(size, count) calloc((size), (count))
@@ -3411,7 +3487,7 @@ <h4 id="fio_set_calloc"><code>FIO_SET_CALLOC</code></h4>
 
 <p>The default allocator is facil.io&#39;s <code>fio_calloc</code>.</p>
 
-<p>To use the system&#39;s memory allocator (<code>calloc</code>), it&#39;s possible to define <code>FIO_FORCE_MALLOC</code> as <code>1</code>. This will persist whenever the <code>fio.h</code> header is included until unset.</p>
+<p>To use the system&#39;s memory allocation / deallocation define <code>FIO_FORCE_MALLOC_TMP</code> as <code>1</code> before including <code>fio.h</code>.</p>
 
 <h4 id="fio_set_free"><code>FIO_SET_FREE</code></h4>
 <pre><code class='highlight'><span class="cp">#define FIO_SET_FREE(ptr, size) free((ptr))
@@ -3420,7 +3496,7 @@ <h4 id="fio_set_free"><code>FIO_SET_FREE</code></h4>
 
 <p>The default deallocator is facil.io&#39;s <code>fio_free</code>.</p>
 
-<p>To use the system&#39;s memory allocator (<code>free</code>), it&#39;s possible to define <code>FIO_FORCE_MALLOC</code> as <code>1</code>. This will persist whenever the <code>fio.h</code> header is included until unset.</p>
+<p>To use the system&#39;s memory allocation / deallocation define <code>FIO_FORCE_MALLOC_TMP</code> as <code>1</code> before including <code>fio.h</code>.</p>
 
 <h3 id="naming-the-set-hash-map">Naming the Set / Hash Map</h3>
 
diff --git a/docs/0.7.x/fio_tls.html b/docs/0.7.x/fio_tls.html
index 2d796d73..9b2f8272 100644
--- a/docs/0.7.x/fio_tls.html
+++ b/docs/0.7.x/fio_tls.html
@@ -62,6 +62,9 @@ <h3 id="the-fiobj-types"><a href="/0.7.x/fiobj">The FIOBJ types</a></h3>
 <li>
 <a href="#fio_tls_proto_add"><code>fio_tls_proto_add</code></a>
 </li>
+<li>
+<a href="#fio_tls_trust"><code>fio_tls_trust</code></a>
+</li>
 </ul>
 </li>
 <li>
@@ -84,27 +87,36 @@ <h3 id="the-fiobj-types"><a href="/0.7.x/fiobj">The FIOBJ types</a></h3>
 
 <p>SSL/TLS provides Transport Layer Security (TLS) for more secure communication.</p>
 
-<p>facil.io attempts to make TLS connections easy by providing a simplified API that abstracts away the underlying TLS library and utilizes the <a href="fio#lower-level-read-write-close-hooks">Read/Write Hooks</a> to allow TLS connections and unencrypted connections to share the same API (<code>fio_write</code>, <code>fio_read</code>, etc&#39;).</p>
+<p>facil.io attempts to make TLS connections easy by providing a simplified API that abstracts away the underlying TLS library.</p>
 
-<p>Future support for BearSSL and OpenSSL is planned.</p>
+<p>OpenSSL support is included starting with facil.io version 0.7.0.beta6.</p>
 
-<p>At the moment, TLS connections aren&#39;t supported since no libraries are supported.</p>
+<p>Future support for BearSSL is planned and an example/template is provided under <code>fio_tls_missing.c</code>, making it easy to use your own SSL/TLS library.</p>
+
+<p>The implementation leverages the <a href="fio#lower-level-read-write-close-hooks">Read/Write Hooks</a> to allow TLS connections and unencrypted connections to share the same code-base and API (<code>fio_write</code>, <code>fio_read</code>, etc&#39;).</p>
 
 <p>To use the facil.io TLS API, include the file <code>fio_tls.h</code></p>
 
 <h3 id="tls-certificates-and-settings">TLS Certificates and Settings</h3>
 
 <h4 id="fio_tls_new"><code>fio_tls_new</code></h4>
-<pre><code class='highlight'><span class="n">fio_tls_s</span> <span class="o">*</span><span class="n">fio_tls_new</span><span class="p">(</span><span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">server_name</span><span class="p">,</span> <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">private_key_file</span><span class="p">,</span>
-                       <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">public_cert_file</span><span class="p">);</span>
+<pre><code class='highlight'><span class="n">fio_tls_s</span> <span class="o">*</span><span class="n">fio_tls_new</span><span class="p">(</span><span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">server_name</span><span class="p">,</span>
+                       <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">private_key_file</span><span class="p">,</span>
+                       <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">public_certificate_file</span><span class="p">,</span>
+                       <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">private_key_password</span><span class="p">);</span>
 </code></pre>
 <p>Creates a new SSL/TLS context / settings object with a default certificate (if any).</p>
 <pre><code class='highlight'><span class="n">fio_tls_s</span> <span class="o">*</span> <span class="n">tls</span> <span class="o">=</span> <span class="n">fio_tls_new</span><span class="p">(</span><span class="s">"www.example.com"</span><span class="p">,</span>
-                              <span class="s">"./ssl/private_key.key"</span><span class="p">,</span>
-                              <span class="s">"./ssl/public_key.crt"</span><span class="p">);</span>
+                              <span class="s">"./ssl/private_key.pem"</span><span class="p">,</span>
+                              <span class="s">"./ssl/public_key.pem"</span><span class="p">,</span>
+                              <span class="nb">NULL</span><span class="p">);</span>
+</code></pre>
+<p>If a server name is provided, than <code>NULL</code> values can be used to create an anonymous (unverified) context / settings object.</p>
+<pre><code class='highlight'><span class="n">fio_tls_s</span> <span class="o">*</span> <span class="n">tls</span> <span class="o">=</span> <span class="n">fio_tls_new</span><span class="p">(</span><span class="s">"www.example.com"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
 </code></pre>
-<p><code>NULL</code> values can be used to create an anonymous (unverified) context / settings object.</p>
-<pre><code class='highlight'><span class="n">fio_tls_s</span> <span class="o">*</span> <span class="n">tls</span> <span class="o">=</span> <span class="n">fio_tls_new</span><span class="p">(</span><span class="s">"www.example.com"</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
+<p>If all values are <code>NULL</code>, a TLS object will be created without a certificate. This could be used for clients together with <code>fio_tls_trust</code></p>
+<pre><code class='highlight'><span class="n">fio_tls_s</span> <span class="o">*</span> <span class="n">tls</span> <span class="o">=</span> <span class="n">fio_tls_new</span><span class="p">(</span><span class="nb">NULL</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">);</span>
+<span class="n">fio_tls_trust</span><span class="p">(</span><span class="n">tls</span><span class="p">,</span> <span class="s">"google-ca.pem"</span> <span class="p">);</span>
 </code></pre>
 <p><code>fio_tls_s *</code> is an opaque type used as a handle for the SSL/TLS functions. It shouldn&#39;t be directly accessed.</p>
 
@@ -118,12 +130,13 @@ <h4 id="fio_tls_destroy"><code>fio_tls_destroy</code></h4>
 <h4 id="fio_tls_cert_add"><code>fio_tls_cert_add</code></h4>
 <pre><code class='highlight'><span class="kt">void</span> <span class="n">fio_tls_cert_add</span><span class="p">(</span><span class="n">fio_tls_s</span> <span class="o">*</span><span class="p">,</span> <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">server_name</span><span class="p">,</span>
                       <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">private_key_file</span><span class="p">,</span>
-                      <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">public_cert_file</span><span class="p">);</span>
+                      <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">public_cert_file</span><span class="p">,</span>
+                      <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">private_key_password</span><span class="p">);</span>
 </code></pre>
 <p>Adds a certificate a new SSL/TLS context / settings object (SNI support).</p>
 <pre><code class='highlight'><span class="n">fio_tls_cert_add</span><span class="p">(</span><span class="n">tls</span><span class="p">,</span> <span class="s">"www.example.com"</span><span class="p">,</span>
-                      <span class="s">"./ssl/private_key.key"</span><span class="p">,</span>
-                      <span class="s">"./ssl/public_key.crt"</span> <span class="p">);</span>
+                      <span class="s">"./ssl/private_key.pem"</span><span class="p">,</span>
+                      <span class="s">"./ssl/public_key.pem"</span> <span class="p">);</span>
 </code></pre>
 <h4 id="fio_tls_proto_add"><code>fio_tls_proto_add</code></h4>
 <pre><code class='highlight'><span class="kt">void</span> <span class="n">fio_tls_proto_add</span><span class="p">(</span><span class="n">fio_tls_s</span> <span class="o">*</span><span class="p">,</span> <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">protocol_name</span><span class="p">,</span>
@@ -133,6 +146,14 @@ <h4 id="fio_tls_proto_add"><code>fio_tls_proto_add</code></h4>
 
 <p>The first protocol added will act as the default protocol to be selected when the client does not support or specify ALPN protocol selection.</p>
 
+<h4 id="fio_tls_trust"><code>fio_tls_trust</code></h4>
+<pre><code class='highlight'><span class="kt">void</span> <span class="n">fio_tls_trust</span><span class="p">(</span><span class="n">fio_tls_s</span> <span class="o">*</span><span class="p">,</span> <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">public_cert_file</span><span class="p">);</span>
+</code></pre>
+<p>Adds a certificate to the &quot;trust&quot; list, which automatically adds a peer verification requirement.</p>
+
+<p>Note, when the fio_tls_s object is used for server connections, this will limit connections to clients that connect using a trusted certificate.</p>
+<pre><code class='highlight'><span class="n">fio_tls_trust</span><span class="p">(</span><span class="n">tls</span><span class="p">,</span> <span class="s">"google-ca.pem"</span> <span class="p">);</span>
+</code></pre>
 <h3 id="tls-connection-establishment">TLS Connection Establishment</h3>
 
 <h4 id="fio_tls_accept"><code>fio_tls_accept</code></h4>
diff --git a/docs/changelog.html b/docs/changelog.html
index b579691c..0e4df3b7 100644
--- a/docs/changelog.html
+++ b/docs/changelog.html
@@ -23,6 +23,9 @@ <h2 id="versions">Versions</h2>
 <li>
 <ul>
 <li>
+<a href="#v-0-7-0-beta6">v. 0.7.0.beta6</a>
+</li>
+<li>
 <a href="#v-0-7-0-beta5">v. 0.7.0.beta5</a>
 </li>
 <li>
@@ -253,6 +256,20 @@ <h2 id="versions">Versions</h2>
 </ul>
 </div><h1 id="change-log">Change Log</h1>
 
+<h3 id="v-0-7-0-beta6">v. 0.7.0.beta6</h3>
+
+<p><strong>BREAK</strong>: (<code>fio_tls</code>) breaking API changes to the SSL/TLS API, adding support for password protected private key files. <em>Note</em>: The TLS API is still fragile and should only be considered stable once version 0.7.0 is released with SSL/TLS support.</p>
+
+<p><strong>Security</strong> / <strong>Fix</strong>: (<code>http</code>) fixed an issue with the HTTP/1.1 parser, where maliciously crafted white-space data could cause a segmentation fault, resulting in a potential DoS.</p>
+
+<p><strong>Fix</strong>: (<code>fio</code>) fixed an issue exposed by implementing the TLS layer, where the highet <code>fd</code> for a connection that wasn&#39;t assigned a <code>protocol_s</code> object immediately after the connection was opened, might avoid timeout review or avoid cleanup during shutdown (which will be marked as a memory leak).</p>
+
+<p><strong>Update</strong>: (<code>fio_tls</code>) added experimental support for OpenSSL. This was only partially tested and should be considered experimental.</p>
+
+<p><strong>Update</strong>: (<code>fio</code>) added, the <code>fio_rw_hook_replace_unsafe</code> to allow r/w hook switching from within a r/w hook callback.</p>
+
+<p><strong>Update</strong>: (<code>fio_cli</code>) a common user-error is a a missing <code>fio_cli_end</code>, resulting in a memory leak notification. Now facil.io protects against this common error by automatically calling  <code>fio_cli_end</code> during the exit stage, if <code>fio_cli_start</code> was called.</p>
+
 <h3 id="v-0-7-0-beta5">v. 0.7.0.beta5</h3>
 
 <p><strong>Fix</strong>: (<code>fio_cli</code>) fixed an issue introduced in version 0.7.0.beta4, where <code>fio_cli_get_i</code> would dereference NULL if the value wasn&#39;t set. Now <code>fio_cli_get_i</code> returns zero (0) for missing values, as expected. Note: this related to the new hex and binary base support in command line numerals.</p>