From 3b49f055ad23e9a1349f4d0d4b7bb261bc155c38 Mon Sep 17 00:00:00 2001
From: Julian Reschke <julian.reschke@gmx.de>
Date: Wed, 3 Jun 2020 11:14:19 +0100
Subject: [PATCH 1/2] restore changes from
 https://github.com/httpwg/http-core/commit/f20cacb0233fabba0b78f0403057d468f5daf1a6

---
 draft-ietf-httpbis-semantics-latest.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/draft-ietf-httpbis-semantics-latest.xml b/draft-ietf-httpbis-semantics-latest.xml
index 7a46ea82e..2cf0f015c 100644
--- a/draft-ietf-httpbis-semantics-latest.xml
+++ b/draft-ietf-httpbis-semantics-latest.xml
@@ -1430,6 +1430,11 @@ deployed and not likely to be registered in a timely manner otherwise.</t>
    A recipient &SHOULD; treat other octets in field content (obs&nbhy;text) as
    opaque data.
 </t>
+<t>
+   Field values containing one or more CR characters ("bare CRs") &MUST-NOT;
+   be generated; recipients &MUST; either reject a field value containing bare
+   CRs, or convert them to SP before processing or forwarding the message.
+</t>
 <t>
    Leading and trailing whitespace in raw field values is removed upon field
    parsing (<xref target="field.parsing"/>). Field definitions where leading or trailing
@@ -12305,6 +12310,10 @@ Content-Encoding: gzip
   Minimum URI lengths to be supported by implementations are now recommended.
   (<xref target="resources"/>)
 </t>
+<t>
+   Prohibited the generation of bare CRs in field values.
+   (<xref target="field.values"/>)
+</t>
 <t>
   The term "effective request URI" has been replaced with "target URI".
   (<xref target="target.resource"/>)
@@ -12559,6 +12568,7 @@ Content-Encoding: gzip
 
 <section title="Since draft-ietf-httpbis-semantics-08" anchor="changes.since.08">
 <ul x:when-empty="None yet.">
+  <li>In <xref target="field.values"/>, disallow bare CRs (<eref target="https://github.com/httpwg/http-core/issues/377"/>)</li>
 </ul>
 </section>
 </section>

From 6b680c97479c82e3cdc1d5037990fcc638621697 Mon Sep 17 00:00:00 2001
From: Julian Reschke <julian.reschke@gmx.de>
Date: Fri, 5 Jun 2020 09:41:09 +0100
Subject: [PATCH 2/2] expand instructions from bare CR to any CTL (also, not to
 send already was a requirement)

---
 draft-ietf-httpbis-semantics-latest.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/draft-ietf-httpbis-semantics-latest.xml b/draft-ietf-httpbis-semantics-latest.xml
index 866b80060..025ff8226 100644
--- a/draft-ietf-httpbis-semantics-latest.xml
+++ b/draft-ietf-httpbis-semantics-latest.xml
@@ -1454,9 +1454,10 @@ Content-Type: text/plain
    opaque data.
 </t>
 <t>
-   Field values containing one or more CR characters ("bare CRs") &MUST-NOT;
-   be generated; recipients &MUST; either reject a field value containing bare
-   CRs, or convert them to SP before processing or forwarding the message.
+   Field values containing control (<x:ref>CTL</x:ref>) characters such as
+   CR or LF are invalid; recipients &MUST; either reject a field value
+   containing control characters, or convert them to SP before processing or
+   forwarding the message.
 </t>
 <t>
    Leading and trailing whitespace in raw field values is removed upon field
@@ -12332,8 +12333,9 @@ Content-Encoding: gzip
   (<xref target="resources"/>)
 </t>
 <t>
-   Prohibited the generation of bare CRs in field values.
-   (<xref target="field.values"/>)
+  Clarify that control characters in field values are to be rejected or
+  mapped to SP.
+  (<xref target="field.values"/>)
 </t>
 <t>
   The term "effective request URI" has been replaced with "target URI".
@@ -12590,7 +12592,7 @@ Content-Encoding: gzip
 <section title="Since draft-ietf-httpbis-semantics-08" anchor="changes.since.08">
 <ul x:when-empty="None yet.">
   <li>In <xref target="field.name.registry"/>, add optional "Comments" entry (<eref target="https://github.com/httpwg/http-core/issues/273"/>)</li>
-  <li>In <xref target="field.values"/>, disallow bare CRs (<eref target="https://github.com/httpwg/http-core/issues/377"/>)</li>
+  <li>In <xref target="field.values"/>, instruct recipients how to deal with control characters in field values (<eref target="https://github.com/httpwg/http-core/issues/377"/>)</li>
   <li>In <xref target="field.values"/>, update note about field ABNF  (<eref target="https://github.com/httpwg/http-core/issues/380"/>)</li>
 </ul>
 </section>