You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2002/04/16 07:43:09 UTC
cvs commit: httpd-2.0/server protocol.c
jerenkrantz 02/04/15 22:43:09
Modified: . CHANGES STATUS
include http_protocol.h
modules/http http_protocol.c
server protocol.c
Log:
Adds support for reading trailers on input by exporting get_mime_headers
to ap_get_mime_headers and calling it in the appropriate place in
ap_http_filter.
showstoppers--;
Revision Changes Path
1.707 +5 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.706
retrieving revision 1.707
diff -u -r1.706 -r1.707
--- CHANGES 15 Apr 2002 03:03:43 -0000 1.706
+++ CHANGES 16 Apr 2002 05:43:08 -0000 1.707
@@ -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.
1.593 +1 -3 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -r1.592 -r1.593
--- STATUS 13 Apr 2002 00:50:20 -0000 1.592
+++ STATUS 16 Apr 2002 05:43:08 -0000 1.593
@@ -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:
@@ -51,8 +51,6 @@
* Daedalus segfaults with 2.0.35
Greg and Cliff are working on this.
-
- * HTTP chunk reads fail to read the trailers.
CURRENT VOTES:
1.76 +6 -0 httpd-2.0/include/http_protocol.h
Index: http_protocol.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/http_protocol.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- http_protocol.h 29 Mar 2002 08:17:19 -0000 1.75
+++ http_protocol.h 16 Apr 2002 05:43:09 -0000 1.76
@@ -91,6 +91,12 @@
*/
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 */
/**
1.409 +2 -1 httpd-2.0/modules/http/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -r1.408 -r1.409
--- http_protocol.c 15 Apr 2002 20:42:45 -0000 1.408
+++ http_protocol.c 16 Apr 2002 05:43:09 -0000 1.409
@@ -766,7 +766,8 @@
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;
1.96 +2 -2 httpd-2.0/server/protocol.c
Index: protocol.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- protocol.c 5 Apr 2002 20:54:59 -0000 1.95
+++ protocol.c 16 Apr 2002 05:43:09 -0000 1.96
@@ -716,7 +716,7 @@
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 @@
}
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");
Re: cvs commit: httpd-2.0/server protocol.c
Posted by Greg Stein <gs...@lyra.org>.
On Tue, Apr 16, 2002 at 05:43:09AM -0000, jerenkrantz@apache.org wrote:
> jerenkrantz 02/04/15 22:43:09
>
> Modified: . CHANGES STATUS
> include http_protocol.h
> modules/http http_protocol.c
> server protocol.c
> Log:
> Adds support for reading trailers on input by exporting get_mime_headers
> to ap_get_mime_headers and calling it in the appropriate place in
> ap_http_filter.
Adding a new API should be a minor bump in ap_mmn.h. That keeps third-party
modules compatible, but also allows them to test for the presence of the new
function at compile time. For example:
#if MODULE_MAGIC_NUMBER_MINOR >= 1
...
ap_get_mime_headers(...)
...
#endif
Cheers,
-g
--
Greg Stein, http://www.lyra.org/