Adds support for reading trailers on input by exporting get_mime_headers

Justin Erenkrantz · Justin Erenkrantz · commit db28bf04cbc3 · 2002-04-16T05:43:09.000Z
to ap_get_mime_headers and calling it in the appropriate place in ap_http_filter. showstoppers--; git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94667 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.36
 
+  *) Add HTTP chunked input trailer support.  [Justin Erenkrantz]
+
+  *) Rename and export get_mime_headers as ap_get_mime_headers.
+     [Justin Erenkrantz]
+
   *) Allow empty Host: header arguments.  PR 7441.  [Justin Erenkrantz]
 
   *) Properly substitute sbindir as httpd's location in apachectl.  PR 7840.
diff --git a/STATUS b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2002/04/13 00:50:20 $]
+Last modified at [$Date: 2002/04/16 05:43:08 $]
 
 Release:
 
@@ -52,8 +52,6 @@ RELEASE SHOWSTOPPERS:
     * Daedalus segfaults with 2.0.35
       Greg and Cliff are working on this.
 
-    * HTTP chunk reads fail to read the trailers.
-
 CURRENT VOTES:
 
     * Should we always build [support*] binaries statically unless otherwise
diff --git a/include/http_protocol.h b/include/http_protocol.h
@@ -91,6 +91,12 @@ AP_DECLARE_DATA extern ap_filter_rec_t *ap_old_write_func;
  */ 
 request_rec *ap_read_request(conn_rec *c);
 
+/**
+ * Read the mime-encoded headers.
+ * @param r The current request
+ */
+void ap_get_mime_headers(request_rec *r);
+
 /* Finish up stuff after a request */
 
 /**
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
@@ -766,7 +766,8 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b,
                 ctx->remaining = get_chunk_size(line);
 
                 if (!ctx->remaining) {
-                    /* Handle trailers by calling get_mime_headers again! */
+                    /* Handle trailers by calling ap_get_mime_headers again! */
+                    ap_get_mime_headers(f->r);
                     e = apr_bucket_eos_create(c->bucket_alloc);
                     APR_BRIGADE_INSERT_TAIL(b, e);
                     return APR_SUCCESS;
diff --git a/server/protocol.c b/server/protocol.c
@@ -716,7 +716,7 @@ static int read_request_line(request_rec *r)
     return 1;
 }
 
-static void get_mime_headers(request_rec *r)
+void ap_get_mime_headers(request_rec *r)
 {
     char* field;
     char *value;
@@ -856,7 +856,7 @@ request_rec *ap_read_request(conn_rec *conn)
     }
 
     if (!r->assbackwards) {
-        get_mime_headers(r);
+        ap_get_mime_headers(r);
         if (r->status != HTTP_REQUEST_TIME_OUT) {
             ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
                           "request failed: error reading the headers");

Original file line number	Diff line number	Diff line change
`@@ -716,7 +716,7 @@ static int read_request_line(request_rec *r)`
`716`	`716`	`return 1;`
`717`	`717`	`}`
`718`	`718`
`719`		`-static void get_mime_headers(request_rec *r)`
	`719`	`+void ap_get_mime_headers(request_rec *r)`
`720`	`720`	`{`
`721`	`721`	`char* field;`
`722`	`722`	`char *value;`
`@@ -856,7 +856,7 @@ request_rec ap_read_request(conn_rec conn)`
`856`	`856`	`}`
`857`	`857`
`858`	`858`	`if (!r->assbackwards) {`
`859`		`- get_mime_headers(r);`
	`859`	`+ ap_get_mime_headers(r);`
`860`	`860`	`if (r->status != HTTP_REQUEST_TIME_OUT) {`
`861`	`861`	`ap_log_rerror(APLOG_MARK, APLOG_NOERRNO\|APLOG_ERR, 0, r,`
`862`	`862`	`"request failed: error reading the headers");`