Remove SSL_TLS_SNI_SERVERNAME (instead of defined but empty) if no SNI

4 files changed, 11 insertions, 13 deletions

diff --git a/doc/s6-tlsc-io.html b/doc/s6-tlsc-io.html
index 9999d4f..f432f1e 100644
--- a/doc/s6-tlsc-io.html
+++ b/doc/s6-tlsc-io.html
@@ -205,11 +205,9 @@ TLS handshake has completed, some data (terminated by two null
 characters) will be sent to file descriptor <em>notif</em>. The
 data contains information about the TLS parameters of the connection;
 its exact contents are left unspecified, but there's at least
-a <tt>SSL_PROTOCOL=<em>protocol</em></tt> string,
-a <tt>SSL_CIPHER=<em>cipher</em></tt> string,
-and a <tt>SSL_TLS_SNI_SERVERNAME=<em>servername</em></tt> string
- all null-terminated. (<em>servername</em> is the empty string if
-no SNI has been required.)
+a <tt>SSL_PROTOCOL=<em>protocol</em></tt> string and
+a <tt>SSL_CIPHER=<em>cipher</em></tt> string, both
+null-terminated.
 Sending this data serves a dual purpose: telling the <em>notif</em>
 reader that the handshake has completed, and providing it with some
 basic information about the connection. If this option is not given,
diff --git a/doc/s6-tlsc.html b/doc/s6-tlsc.html
index 32070c0..6f644c4 100644
--- a/doc/s6-tlsc.html
+++ b/doc/s6-tlsc.html
@@ -95,8 +95,9 @@ environment variables:
 TLSv1, TLSv1.1, TLSv1.2... </li>
  <li> <tt>SSL_CIPHER</tt> contains the name of the cipher
 used. </li>
- <li> <tt>SSL_TLS_SNI_SERVERNAME</tt> contains the required SNI
-server name, if any, or is empty otherwise. </li>
+ <li> <tt>SSL_TLS_SNI_SERVERNAME</tt> contains <em>servername</em>,
+if the <tt>-k</tt> option has been given; otherwise it is removed
+from the environment. </li>
  <li> More similar environment variables containing information
 about the connection may be added in the future. </li>
 </ul>
diff --git a/doc/s6-tlsd-io.html b/doc/s6-tlsd-io.html
index 53b1282..7e38885 100644
--- a/doc/s6-tlsd-io.html
+++ b/doc/s6-tlsd-io.html
@@ -200,11 +200,9 @@ TLS handshake has completed, some data (terminated by two null
 characters) will be sent to file descriptor <em>notif</em>. The
 data contains information about the TLS parameters of the connection;
 its exact contents are left unspecified, but there's at least
-a <tt>SSL_PROTOCOL=<em>protocol</em></tt> string,
-a <tt>SSL_CIPHER=<em>cipher</em></tt> string,
-and a <tt>SSL_TLS_SNI_SERVERNAME=<em>servername</em></tt> string
- all null-terminated. (<em>servername</em> is the empty string if
-no SNI has been required.)
+a <tt>SSL_PROTOCOL=<em>protocol</em></tt> string and
+a <tt>SSL_CIPHER=<em>cipher</em></tt> string, both
+null-terminated.
 Sending this data serves a dual purpose: telling the <em>notif</em>
 reader that the handshake has completed, and providing it with some
 basic information about the connection. If this option is not given,
diff --git a/doc/s6-tlsd.html b/doc/s6-tlsd.html
index 83b70c1..011a20f 100644
--- a/doc/s6-tlsd.html
+++ b/doc/s6-tlsd.html
@@ -105,7 +105,8 @@ TLSv1, TLSv1.1, TLSv1.2... </li>
  <li> <tt>SSL_CIPHER</tt> contains the name of the cipher
 used. </li>
  <li> <tt>SSL_TLS_SNI_SERVERNAME</tt> contains the required SNI
-server name, if any, or is empty otherwise. </li>
+server name, if any. It is removed from the environment if no SNI
+has been sent by the client. </li>
  <li> More similar environment variables containing information
 about the connection may be added in the future. </li>
 </ul>