Commit 1758ce24 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Apply patch for PR 41056 (19954) to fix chunk 

filter. Now flushes work better.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@480135 13f79535-47bb-0310-9956-ffa450edef68
parent dae9b3f4

modules/http/http_filters.c

+23 −5
Changes for modules/http/http_filters.c: 23 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ typedef struct http_filter_ctx { 
    enum {

        BODY_NONE,

        BODY_LENGTH,

        BODY_CHUNK

        BODY_CHUNK,

        BODY_CHUNK_PART

    } state;

    int eos_sent;

} http_ctx_t;
@@ -211,7 +212,13 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, 
            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)) {

                return APR_EAGAIN;

            }



            if (rv == APR_SUCCESS) {

                /* We have to check the length of the brigade we got back.
@@ -273,7 +280,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, 
            APR_BRIGADE_INSERT_TAIL(b, e);

            ctx->eos_sent = 1;

            return APR_SUCCESS;

        case BODY_CHUNK:

        case BODY_CHUNK: case BODY_CHUNK_PART:

            {

                char line[30];

                apr_bucket_brigade *bb;
@@ -283,14 +290,25 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, 
                bb = apr_brigade_create(f->r->pool, f->c->bucket_alloc);



                /* We need to read the CRLF after the chunk.  */

                if (ctx->state == BODY_CHUNK) {

                    rv = ap_get_brigade(f->next, bb, AP_MODE_GETLINE,

                                    APR_BLOCK_READ, 0);

                                        block, 0);

                    apr_brigade_cleanup(bb);

                } 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)) {

                        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) {