summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/s6-ucspitlsc.html8
-rw-r--r--doc/s6-ucspitlsd.html8
-rw-r--r--src/tls/s6-ucspitlsc.c1
-rw-r--r--src/tls/s6-ucspitlsd.c1
4 files changed, 10 insertions, 8 deletions
diff --git a/doc/s6-ucspitlsc.html b/doc/s6-ucspitlsc.html
index 4c1d2be..627945f 100644
--- a/doc/s6-ucspitlsc.html
+++ b/doc/s6-ucspitlsc.html
@@ -148,10 +148,10 @@ connection without using <tt>close_notify</tt>. This is the default. </li>
<li> <tt>-k&nbsp;<em>servername</em></tt>&nbsp;: use Server Name
Indication, and send <em>servername</em>. The default is not to
use SNI, which may be a security risk. </li>
- <li> <tt>-K&nbsp;<em>kimeout</em></tt>&nbsp;: close the connection
-if <em>kimeout</em> milliseconds elapse without any data being
-received from either side. The default is 0, which means
-infinite timeout (never kill the connection). </li>
+ <li> <tt>-K&nbsp;<em>kimeout</em></tt>&nbsp;: close the connection if
+the handshake takes more than <em>kimeout</em> milliseconds to complete.
+The default is 0, which means infinite timeout: let the handshake complete
+at its own pace, no matter how slow. </li>
<li> <tt>-6&nbsp;<em>fdr</em></tt>&nbsp;: expect an open file
descriptor numbered <em>fdr</em> to read network (ciphertext)
data from. Make sure <em>prog</em> also reads its data
diff --git a/doc/s6-ucspitlsd.html b/doc/s6-ucspitlsd.html
index 51372e2..7d7ef9b 100644
--- a/doc/s6-ucspitlsd.html
+++ b/doc/s6-ucspitlsd.html
@@ -146,10 +146,10 @@ connection without using <tt>close_notify</tt>. This is the default. </li>
<li> <tt>-y</tt>&nbsp;: Require a mandatory client certificate.
The default, with neither the <tt>-Y</tt> nor the <tt>-y</tt> option,
is not to require a client certificate at all. </li>
- <li> <tt>-K&nbsp;<em>kimeout</em></tt>&nbsp;: close the connection
-if <em>kimeout</em> milliseconds elapse without any data being
-received from either side. The default is 0, which means
-infinite timeout (never kill the connection). </li>
+ <li> <tt>-K&nbsp;<em>kimeout</em></tt>&nbsp;: close the connection if
+the handshake takes more than <em>kimeout</em> milliseconds to complete.
+The default is 0, which means infinite timeout: let the handshake complete
+at its own pace, no matter how slow. </li>
</ul>
<h2> Notes </h2>
diff --git a/src/tls/s6-ucspitlsc.c b/src/tls/s6-ucspitlsc.c
index c8e2e68..fd5bc86 100644
--- a/src/tls/s6-ucspitlsc.c
+++ b/src/tls/s6-ucspitlsc.c
@@ -37,6 +37,7 @@ static inline void child (int p[4][2], uint32_t options, unsigned int verbosity,
case 'y' :
close(p[2][1]) ;
p[2][1] = 0 ; /* we know 0 is open so it's a correct invalid value */
+ break ;
case 'Y' :
fd_shutdown(p[2][1], 0) ;
break ;
diff --git a/src/tls/s6-ucspitlsd.c b/src/tls/s6-ucspitlsd.c
index dbabf4e..2ece32f 100644
--- a/src/tls/s6-ucspitlsd.c
+++ b/src/tls/s6-ucspitlsd.c
@@ -34,6 +34,7 @@ static inline void child (int p[4][2], uint32_t options, unsigned int verbosity,
case 'y' :
close(p[2][1]) ;
p[2][1] = 0 ; /* we know 0 is open so it's a correct invalid value */
+ break ;
case 'Y' :
fd_shutdown(p[2][1], 0) ;
break ;