Attachment 311047 Details for Bug 454098 – Patch from upstream

[patch] Patch from upstream

httpd-2.2.3-chunked.patch (text/plain), 2.83 KB, created by Mark Spensser on 2008-07-04 15:56:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Spensser

Created: 2008-07-04 15:56:44 UTC

Size: 2.83 KB

patch

obsolete

>--- httpd-2.2.3/modules/http/http_filters.c.chunked	2008-06-30 22:03:16.000000000 +0400
>+++ httpd-2.2.3/modules/http/http_filters.c	2008-06-30 22:03:32.000000000 +0400
>@@ -64,7 +64,8 @@
>     enum {
>         BODY_NONE,
>         BODY_LENGTH,
>-        BODY_CHUNK
>+        BODY_CHUNK,
>+        BODY_CHUNK_PART
>     } state;
>     int eos_sent;
> } http_ctx_t;
>@@ -211,7 +212,15 @@
>             bb = apr_brigade_create(f->r->pool, f->c->bucket_alloc);
> 
>             rv = ap_get_brigade(f->next, bb, AP_MODE_GETLINE,
>-                                APR_BLOCK_READ, 0);
>+                                block, 0);
>+
>+            /* for timeout */
>+            if (block == APR_NONBLOCK_READ &&
>+                ( (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb)) ||
>+                  (APR_STATUS_IS_EAGAIN(rv)) )) {
>+                ctx->state = BODY_CHUNK_PART;
>+                return APR_EAGAIN;
>+            }
> 
>             if (rv == APR_SUCCESS) {
>                 /* We have to check the length of the brigade we got back.
>@@ -274,6 +283,7 @@
>             ctx->eos_sent = 1;
>             return APR_SUCCESS;
>         case BODY_CHUNK:
>+        case BODY_CHUNK_PART:
>             {
>                 char line[30];
>                 apr_bucket_brigade *bb;
>@@ -283,14 +293,30 @@
>                 bb = apr_brigade_create(f->r->pool, f->c->bucket_alloc);
> 
>                 /* We need to read the CRLF after the chunk.  */
>-                rv = ap_get_brigade(f->next, bb, AP_MODE_GETLINE,
>-                                    APR_BLOCK_READ, 0);
>-                apr_brigade_cleanup(bb);
>+                if (ctx->state == BODY_CHUNK) {
>+                    rv = ap_get_brigade(f->next, bb, AP_MODE_GETLINE,
>+                                        block, 0);
>+                    apr_brigade_cleanup(bb);
>+                    if (block == APR_NONBLOCK_READ &&
>+                        (APR_STATUS_IS_EAGAIN(rv))) {
>+                        return APR_EAGAIN;
>+                    }
>+                } else {
>+                    rv = APR_SUCCESS;
>+                }
> 
>                 if (rv == APR_SUCCESS) {
>                     /* Read the real chunk line. */
>                     rv = ap_get_brigade(f->next, bb, AP_MODE_GETLINE,
>-                                        APR_BLOCK_READ, 0);
>+                                        block, 0);
>+                    /* Test timeout */
>+                    if (block == APR_NONBLOCK_READ &&
>+                        ( (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb)) ||
>+                          (APR_STATUS_IS_EAGAIN(rv)) )) {
>+                        ctx->state = BODY_CHUNK_PART;
>+                        return APR_EAGAIN;
>+                    }
>+                    ctx->state = BODY_CHUNK;
>                     if (rv == APR_SUCCESS) {
>                         rv = apr_brigade_flatten(bb, line, &len);
>                         if (rv == APR_SUCCESS) {

Actions: View | Diff

Attachments on bug 454098: 311047