Commit 56ba8e70 authored by Joe Orton's avatar Joe Orton
Browse files

* server/core.c (default_handler): Use apr_brigade_insert_file() to 

append the file to the brigade.

* server/protocol.c (ap_send_fd),
modules/proxy/mod_proxy_http.c (spool_reqbody_cl), 
modules/cache/mod_mem_cache.c (recall_body),
modules/cache/mod_disk_cache.c (recall_body),
modules/mappers/mod_negotiation.c (handle_map_file),
modules/generators/mod_asis.c (asis_handler),
modules/dav/fs/repos.c [DEBUG_GET_HANDLER] (dav_fs_deliver),
modules/arch/win32/mod_isapi.c (ServerSupportFunction): Likewise.


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

modules/arch/win32/mod_isapi.c

+1 −22
Original line number Diff line number Diff line
@@ -1050,28 +1050,7 @@ int APR_THREAD_FUNC ServerSupportFunction(isapi_cid *cid, 
        }



        sent += (apr_uint32_t)fsize;

#if APR_HAS_LARGE_FILES

        if (r->finfo.size > AP_MAX_SENDFILE) {

            /* APR_HAS_LARGE_FILES issue; must split into mutiple buckets,

             * no greater than MAX(apr_size_t), and more granular than that

             * in case the brigade code/filters attempt to read it directly.

             */

            b = apr_bucket_file_create(fd, tf->Offset, AP_MAX_SENDFILE,

                                       r->pool, c->bucket_alloc);

            while (fsize > AP_MAX_SENDFILE) {

                apr_bucket *bc;

                apr_bucket_copy(b, &bc);

                APR_BRIGADE_INSERT_TAIL(bb, bc);

                b->start += AP_MAX_SENDFILE;

                fsize -= AP_MAX_SENDFILE;

            }

            b->length = (apr_size_t)fsize; /* Resize just the last bucket */

        }

        else

#endif

            b = apr_bucket_file_create(fd, tf->Offset, (apr_size_t)fsize,

                                       r->pool, c->bucket_alloc);

        APR_BRIGADE_INSERT_TAIL(bb, b);

        apr_brigade_insert_file(bb, fd, tf->Offset, fsize, r->pool);



        if (tf->pTail && tf->TailLength) {

            sent += tf->TailLength;

modules/cache/mod_disk_cache.c

+2 −3
Original line number Diff line number Diff line
@@ -776,9 +776,8 @@ static apr_status_t recall_body(cache_handle_t *h, apr_pool_t *p, apr_bucket_bri 
    apr_bucket *e;

    disk_cache_object_t *dobj = (disk_cache_object_t*) h->cache_obj->vobj;



    e = apr_bucket_file_create(dobj->fd, 0, (apr_size_t) dobj->file_size, p,

                               bb->bucket_alloc);

    APR_BRIGADE_INSERT_HEAD(bb, e);

    apr_brigade_insert_file(bb, dobj->fd, 0, dobj->file_size, p);



    e = apr_bucket_eos_create(bb->bucket_alloc);

    APR_BRIGADE_INSERT_TAIL(bb, e);

modules/cache/mod_file_cache.c

+2 −3
Original line number Diff line number Diff line
@@ -297,9 +297,8 @@ static int sendfile_handler(request_rec *r, a_file *file) 
    apr_bucket *b;

    apr_bucket_brigade *bb = apr_brigade_create(r->pool, c->bucket_alloc);



    b = apr_bucket_file_create(file->file, 0, (apr_size_t)file->finfo.size,

                               r->pool, c->bucket_alloc);

    APR_BRIGADE_INSERT_TAIL(bb, b);

    apr_brigade_insert_file(bb, file->file, 0, file->finfo.size, r->pool);



    b = apr_bucket_eos_create(c->bucket_alloc);

    APR_BRIGADE_INSERT_TAIL(bb, b);

modules/cache/mod_mem_cache.c

+3 −2
Original line number Diff line number Diff line
@@ -652,13 +652,14 @@ static apr_status_t recall_body(cache_handle_t *h, apr_pool_t *p, apr_bucket_bri 
        /* CACHE_TYPE_FILE */

        apr_file_t *file;

        apr_os_file_put(&file, &mobj->fd, mobj->flags, p);

        b = apr_bucket_file_create(file, 0, mobj->m_len, p, bb->bucket_alloc);



        apr_brigade_insert_file(bb, file, 0, mobj->m_len, p);

    }

    else {

        /* CACHE_TYPE_HEAP */

        b = apr_bucket_immortal_create(mobj->m, mobj->m_len, bb->bucket_alloc);

    }

        APR_BRIGADE_INSERT_TAIL(bb, b);

    }

    b = apr_bucket_eos_create(bb->bucket_alloc);

    APR_BRIGADE_INSERT_TAIL(bb, b);

modules/dav/fs/repos.c

+1 −5
Original line number Diff line number Diff line
@@ -980,11 +980,7 @@ static dav_error * dav_fs_deliver(const dav_resource *resource, 


    bb = apr_brigade_create(pool, output->c->bucket_alloc);



    /* ### this does not handle large files. but this is test code anyway */

    bkt = apr_bucket_file_create(fd, 0,

                                 (apr_size_t)resource->info->finfo.size,

                                 pool, output->c->bucket_alloc);

    APR_BRIGADE_INSERT_TAIL(bb, bkt);

    apr_brigade_insert_file(bb, fd, 0, resource->info->finfo.size, pool);



    bkt = apr_bucket_eos_create(output->c->bucket_alloc);

    APR_BRIGADE_INSERT_TAIL(bb, bkt);