Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
MIME-Version: 1.0
In-Reply-To: <CAKQ1sVM_8S6qhKC79HV2KrRxzB42Ri5h4hhPt86waffefTFHAw@mail.gmail.com>
References: <20160803225811.8D40F3A00EC@svn01-us-west.apache.org> <CAKQ1sVM_8S6qhKC79HV2KrRxzB42Ri5h4hhPt86waffefTFHAw@mail.gmail.com>
From: William A Rowe Jr <wrowe@rowe-clan.net>
Date: Fri, 5 Aug 2016 12:33:33 -0500
Message-ID: <CACsi2511XMh-yo-1Ky39iSSP+L_mystw7b-5Hw2G3MPMx1fYog@mail.gmail.com>
Subject: Re: svn commit: r1755124 - /httpd/httpd/trunk/server/protocol.c
To: httpd <dev@httpd.apache.org>
Content-Type: multipart/alternative; boundary=001a113f3a883d1edb05395677c8
archived-at: Fri, 05 Aug 2016 17:33:39 -0000

--001a113f3a883d1edb05395677c8
Content-Type: text/plain; charset=UTF-8

On Fri, Aug 5, 2016 at 10:43 AM, Yann Ylavic <ylavic.dev@gmail.com> wrote:

> @@ -903,8 +903,16 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_
>               */
>              continue;
>          }
> -        else if (last_field != NULL) {
>
> +        if (last_field == NULL) {
> +            /* Keep track of this first header line so that we can extend
> it
> +             * across any obs-fold or parse it on the next loop iteration.
> +             */
> +            last_field = field;
> +            last_len = len;
> +            continue;
> +        }
> +
>              /* Process the previous last_field header line with all
> obs-folded
>               * segments already concatinated (this is not operating on the
>               * most recently read input line).
>

This patch makes it less clear that the continue; case above also avoided
the empty-line case (that was clearer in the main loop imo), while adding
the unnecessary verification of last_len != 0 from line 904, so I'd say
it's a
net loss of legibility in spite of gaining us 4 characters.  Just my 2c.

--001a113f3a883d1edb05395677c8
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div class=3D"gmail_extra"><div class=3D"gmail_quote">On F=
ri, Aug 5, 2016 at 10:43 AM, Yann Ylavic <span dir=3D"ltr">&lt;<a href=3D"m=
ailto:ylavic.dev@gmail.com" target=3D"_blank">ylavic.dev@gmail.com</a>&gt;<=
/span> wrote:<br><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8=
ex;border-left:1px #ccc solid;padding-left:1ex">@@ -903,8 +903,16 @@ AP_DEC=
LARE(void) ap_get_mime_headers_core(<wbr>request_<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 */<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0continue;<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}<br>
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 else if (last_field !=3D NULL) {<br>
<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (last_field =3D=3D NULL) {<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* Keep track of this first head=
er line so that we can extend it<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* across any obs-fold or p=
arse it on the next loop iteration.<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*/<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 last_field =3D field;<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 last_len =3D len;<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 continue;<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 }<br>
+<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* Process the previous las=
t_field header line with all obs-folded<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 * segments already concati=
nated (this is not operating on the<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 * most recently read input=
 line).<br></blockquote><div>=C2=A0</div><div>This patch makes it less clea=
r that the continue; case above also avoided</div><div>the empty-line case =
(that was clearer in the main loop imo), while adding=C2=A0</div><div>the u=
nnecessary verification of last_len !=3D 0 from line 904, so I&#39;d say it=
&#39;s a=C2=A0</div><div>net loss of legibility in spite of gaining us 4 ch=
aracters.=C2=A0 Just my 2c.</div><div><br></div><div><br></div></div></div>=
</div>

--001a113f3a883d1edb05395677c8--