Merge branch 'http_extensions' into this_aint_h2

.gitignore

@@ -10,4 +10,3 @@ venv/
 issues.json
 lib
 .targets.mk
-draft-ietf-quic-tls.md

draft-ietf-quic-http.md

@@ -626,11 +626,6 @@ The payload consists of:
   Payload:
   : HPACK-compressed request headers for the promised response.
 
-TODOs:
-
- - QUIC stream space may be enlarged; would need to redefine Promised Stream
-   field in this case.
- - No CONTINUATION -- HEADERS have EHB; do we need it here?
 
 
 # Error Handling {#errors}
@@ -1067,8 +1062,23 @@ The original authors of this specification were Robbie Shade and Mike Warres.
 
 ## Since draft-ietf-quic-http-01:
 
-- SETTINGS can be sent only one at the start of a connection.  SETTINGS_ACK
-  removed.
+- SETTINGS changes:
+
+    - SETTINGS can be sent only once at the start of a connection; no changes
+    - SETTINGS_ACK removed
+    - Settings can only occur in the SETTINGS frame a single time
+    - Boolean format updated
+
+- Alt-Svc parameter changed from "v" to "quic"; format updated
+
+- Closing the connection control stream or any message control stream is a
+  fatal error
+
+- HPACK Sequence counter can wrap
+
+- 0-RTT guidance added
+
+- Guide to differences from HTTP/2 and porting HTTP/2 extensions added
 
 ## Since draft-ietf-quic-http-00:
 
@@ -1079,7 +1089,7 @@ The original authors of this specification were Robbie Shade and Mike Warres.
 
 - Adopted SETTINGS format from draft-bishop-httpbis-extended-settings-01
 
-- Reworked SETTINGS_ACK to account for indeterminate inter-stream order.
+- Reworked SETTINGS_ACK to account for indeterminate inter-stream order
 
 - Described CONNECT pseudo-method
 

draft-ietf-quic-recovery.md

@@ -383,6 +383,12 @@ timeouts{{?RFC6298}} are an alarm based mechanism to recover from cases when
 there are outstanding retransmittable packets, but an acknowledgement has
 not been received in a timely manner.
 
+### Early Retransmit
+
+Early retransmit {{?RFC5827}} is implemented with a 1/4 RTT timer. It is
+part of QUIC's time based loss detection, but is always enabled, even when
+only packet reordering loss detection is enabled.
+
 ### Pseudocode
 
 Pseudocode for SetLossDetectionAlarm follows:
@@ -402,18 +408,18 @@ Pseudocode for SetLossDetectionAlarm follows:
       alarm_duration = max(alarm_duration, kMinTLPTimeout)
       alarm_duration = alarm_duration << handshake_count
     else if (largest sent packet is acked):
-      // Early retransmit {{?RFC5827}}
+      // Early retransmit
       // with an alarm to reduce spurious retransmits.
       alarm_duration = 0.25 * smoothed_rtt
     else if (tlp_count < kMaxTLPs):
-      // Tail Loss Probe {{?I-D.dukkipati-tcpm-tcp-loss-probe}}
+      // Tail Loss Probe
       if (retransmittable_packets_outstanding = 1):
         alarm_duration = 1.5 * smoothed_rtt + kDelayedAckTimeout
       else:
         alarm_duration = kMinTLPTimeout
       alarm_duration = max(alarm_duration, 2 * smoothed_rtt)
     else:
-      // RTO alarm.
+      // RTO alarm
       if (rto_count = 0):
         alarm_duration = smoothed_rtt + 4 * rttvar
         alarm_duration = max(alarm_duration, kMinRTOTimeout)