Merge pull request #1765 from nibanks/pr/optional-idle-timeout

Optional Idle Timeout

draft-ietf-quic-transport.md

@@ -1606,14 +1606,6 @@ type TRANSPORT_PARAMETER_ERROR.
 
 ### Transport Parameter Definitions
 
-An endpoint MUST include the following parameters in its encoded
-TransportParameters:
-
-idle_timeout (0x0003):
-
-: The idle timeout is a value in seconds that is encoded as an unsigned 16-bit
-  integer.  The maximum value is 600 seconds (10 minutes).
-
 An endpoint MAY use the following transport parameters:
 
 initial_max_data (0x0001):
@@ -1649,6 +1641,12 @@ initial_max_uni_streams (0x0008):
   MAX_STREAM_ID containing 18 when received by a client or 19 when received by a
   server.
 
+idle_timeout (0x0003):
+
+: The idle timeout is a value in seconds that is encoded as an unsigned 16-bit
+  integer.  If this parameter is absent or zero then the idle timeout is
+  disabled.
+
 max_packet_size (0x0005):
 
 : The maximum packet size parameter places a limit on the size of packets that
@@ -2531,9 +2529,9 @@ source address.
 
 ### Idle Timeout
 
-A connection that remains idle for longer than the advertised idle timeout (see
-{{transport-parameter-definitions}}) is closed.  A connection enters the
-draining state when the idle timeout expires.
+If the idle timeout is enabled, a connection that remains idle for longer than
+the advertised idle timeout (see {{transport-parameter-definitions}}) is closed.
+A connection enters the draining state when the idle timeout expires.
 
 Each endpoint advertises their own idle timeout to their peer. The idle timeout
 starts from the last packet received.  In order to ensure that initiating new