apreq: Sync r1894940 from libapreq.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1894941 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/apreq_parser_header.c b/server/apreq_parser_header.c
index 55e0beaf753e6fde72c6f43ce8357a6fa2eda63f..c420a91a005e2d5f0a34254ede730ca1b468898b 100644 (file)
--- a/server/apreq_parser_header.c
+++ b/server/apreq_parser_header.c
@@ -41,7 +41,7 @@ struct hdr_ctx {
         HDR_GAP,
         HDR_VALUE,
         HDR_NEWLINE,
-        HDR_CONTLINE,
+        HDR_FOLDLINE,
         HDR_WANTLINE,
         HDR_NEXTLINE,
         HDR_LASTLINE,
@@ -343,41 +343,39 @@ APREQ_DECLARE_PARSER(apreq_parse_headers)
             if (off == dlen)
                 break;
 
-            {
-                ch = data[off];
-                switch (ch) {
-                case ' ':
-                case '\t':
-                    ++off;
-                    ++ctx->vlen;
-                    break;
+            ch = data[off];
+            switch (ch) {
+            case ' ':
+            case '\t':
+                ++off;
+                ++ctx->vlen;
+                break;
 
-                default:
-                    /* can parse brigade now */
-                    if (off > 0)
-                        apr_bucket_split(e, off);
-                    s = split_header_line(&param, pool, ctx->bb, ctx->nlen, ctx->glen, ctx->vlen);
-                    if (parser->hook != NULL && s == APR_SUCCESS)
-                        s = apreq_hook_run(parser->hook, param, NULL);
-                    if (s != APR_SUCCESS) {
-                        ctx->status = HDR_ERROR;
-                        return s;
-                    }
+            default:
+                /* can parse brigade now */
+                if (off > 0)
+                    apr_bucket_split(e, off);
+                s = split_header_line(&param, pool, ctx->bb, ctx->nlen, ctx->glen, ctx->vlen);
+                if (parser->hook != NULL && s == APR_SUCCESS)
+                    s = apreq_hook_run(parser->hook, param, NULL);
+                if (s != APR_SUCCESS) {
+                    ctx->status = HDR_ERROR;
+                    return s;
+                }
 
-                    apreq_value_table_add(&param->v, t);
-                    ctx->nlen = 0;
-                    ctx->vlen = 0;
-                    ctx->glen = 0;
+                apreq_value_table_add(&param->v, t);
+                ctx->nlen = 0;
+                ctx->vlen = 0;
+                ctx->glen = 0;
 
-                    ctx->status = HDR_NEXTLINE;
-                    goto parse_hdr_bucket;
-                }
+                ctx->status = HDR_NEXTLINE;
+                goto parse_hdr_bucket;
             }
 
             /* fall thru */
-            ctx->status = HDR_CONTLINE;
+            ctx->status = HDR_FOLDLINE;
 
-        case HDR_CONTLINE:
+        case HDR_FOLDLINE:
 
             while (off < dlen) {
                 ch = data[off++];