httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1777672 - /httpd/httpd/trunk/modules/http/http_filters.c
Date Fri, 06 Jan 2017 18:04:31 GMT
Author: ylavic
Date: Fri Jan  6 18:04:31 2017
New Revision: 1777672

URL: http://svn.apache.org/viewvc?rev=1777672&view=rev
Log:
http: follow up to r1777460.
We should not unfold in HTTP headers in any case, "message/http" is inner content.

Modified:
    httpd/httpd/trunk/modules/http/http_filters.c

Modified: httpd/httpd/trunk/modules/http/http_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?rev=1777672&r1=1777671&r2=1777672&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_filters.c (original)
+++ httpd/httpd/trunk/modules/http/http_filters.c Fri Jan  6 18:04:31 2017
@@ -631,8 +631,7 @@ apr_status_t ap_http_filter(ap_filter_t
 
 struct check_header_ctx {
     request_rec *r;
-    unsigned int strict:1,
-                 unfold:1;
+    int strict;
 };
 
 /* check a single header, to be used with apr_table_do() */
@@ -673,10 +672,7 @@ static int check_header(struct check_hea
                               name, pos);
                 return 0;
             }
-            if (!ctx->unfold) {
-                end += 3;
-            }
-            else if (!dst) {
+            if (!dst) {
                 *val = dst = apr_palloc(ctx->r->pool, strlen(*val) + 1);
             }
         }
@@ -726,8 +722,6 @@ static APR_INLINE int check_headers(requ
 
     ctx.r = r;
     ctx.strict = (conf->http_conformance != AP_HTTP_CONFORMANCE_UNSAFE);
-    ctx.unfold = (!r->content_type || strncmp(r->content_type,
-                                              "message/http", 12));
     return check_headers_table(r->headers_out, &ctx) &&
            check_headers_table(r->err_headers_out, &ctx);
 }



Mime
View raw message