You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by "Roy T. Fielding" <fi...@kiwi.ics.uci.edu> on 1998/01/27 20:55:19 UTC

Re: cvs commit: apache-1.2/src CHANGES http_request.c

>  Roy's patch fixed the extra-data-after-post problem for the user.
>  PR:             1399
>  Submitted by:   Roy Fielding
>  Reviewed by:    Martin Kraemer, Dean Gaudet

Can you back-port the other half of that change as well?  Included below.

....Roy


Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_protocol.c,v
retrieving revision 1.169
diff -u -r1.169 http_protocol.c
--- http_protocol.c	1997/11/01 22:24:08	1.169
+++ http_protocol.c	1997/11/14 18:28:19
@@ -1386,13 +1386,13 @@
 
 API_EXPORT(int) should_client_block(request_rec *r)
 {
-    if (r->read_length || is_HTTP_ERROR(r->status))
-        return 0;
+    /* First check if we have already read the request body */
 
-    if (!r->read_chunked && (r->remaining <= 0))
+    if (r->read_length || (!r->read_chunked && (r->remaining <= 0)))
         return 0;
 
-    if (r->proto_num >= HTTP_VERSION(1,1)) { /* sending 100 Continue interim response */
+    if (r->proto_num >= HTTP_VERSION(1,1)) {
+        /* sending 100 Continue interim response */
         bvputs(r->connection->client,
                SERVER_PROTOCOL, " ", status_lines[0], "\015\012\015\012",
                NULL);

Re: cvs commit: apache-1.2/src CHANGES http_request.c

Posted by Dean Gaudet <dg...@arctic.org>.
Yup it's sitting in my "todo" queue, thanks for the reminder. 

Dean

On Tue, 27 Jan 1998, Roy T. Fielding wrote:

> >  Roy's patch fixed the extra-data-after-post problem for the user.
> >  PR:             1399
> >  Submitted by:   Roy Fielding
> >  Reviewed by:    Martin Kraemer, Dean Gaudet
> 
> Can you back-port the other half of that change as well?  Included below.
> 
> ....Roy
> 
> 
> Index: http_protocol.c
> ===================================================================
> RCS file: /export/home/cvs/apachen/src/main/http_protocol.c,v
> retrieving revision 1.169
> diff -u -r1.169 http_protocol.c
> --- http_protocol.c	1997/11/01 22:24:08	1.169
> +++ http_protocol.c	1997/11/14 18:28:19
> @@ -1386,13 +1386,13 @@
>  
>  API_EXPORT(int) should_client_block(request_rec *r)
>  {
> -    if (r->read_length || is_HTTP_ERROR(r->status))
> -        return 0;
> +    /* First check if we have already read the request body */
>  
> -    if (!r->read_chunked && (r->remaining <= 0))
> +    if (r->read_length || (!r->read_chunked && (r->remaining <= 0)))
>          return 0;
>  
> -    if (r->proto_num >= HTTP_VERSION(1,1)) { /* sending 100 Continue interim response */
> +    if (r->proto_num >= HTTP_VERSION(1,1)) {
> +        /* sending 100 Continue interim response */
>          bvputs(r->connection->client,
>                 SERVER_PROTOCOL, " ", status_lines[0], "\015\012\015\012",
>                 NULL);
>