Commit 43b501b7 authored by Eric Covener's avatar Eric Covener
Browse files

refactor to pull setting of Accept-Ranges header into http_protocol.c which 

had been copied to other handlers.



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

include/ap_mmn.h

+2 −1
Changes for include/ap_mmn.h: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ 
 * 20110724.2 (2.3.15-dev) retries and retry_delay in util_ldap_state_t

 * 20110724.3 (2.3.15-dev) add util_varbuf.h / ap_varbuf API

 * 20110724.4 (2.3.15-dev) add max_ranges to core_dir_config

 * 20110724.5 (2.3.15-dev) add ap_set_accept_ranges()

 */



#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -356,7 +357,7 @@ 
#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20110724

#endif

#define MODULE_MAGIC_NUMBER_MINOR 4                    /* 0...n */

#define MODULE_MAGIC_NUMBER_MINOR 5                    /* 0...n */



/**

 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

include/http_protocol.h

+7 −0
Changes for include/http_protocol.h: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -306,6 +306,13 @@ AP_DECLARE(void) ap_clear_method_list(ap_method_list_t *l); 
 */

AP_DECLARE(void) ap_set_content_type(request_rec *r, const char *ct);



/**

 * Set the Accept-Ranges header for this respons

 * @param r The current request

 */

AP_DECLARE(void) ap_set_accept_ranges(request_rec *r);





/* Hmmm... could macrofy these for now, and maybe forever, though the

 * definitions of the macros would get a whole lot hairier.

 */

modules/dav/fs/repos.c

+1 −1
Changes for modules/dav/fs/repos.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1056,7 +1056,7 @@ static dav_error * dav_fs_set_headers(request_rec *r, 
    ap_set_etag(r);



    /* we accept byte-ranges */

    apr_table_setn(r->headers_out, "Accept-Ranges", "bytes");

    ap_set_accept_ranges(r);



    /* set up the Content-Length header */

    ap_set_content_length(r, resource->info->finfo.size);

modules/filters/mod_reflector.c

+1 −1
Changes for modules/filters/mod_reflector.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static int reflector_handler(request_rec * r) 
            ap_update_mtime(r, apr_time_now());

            ap_set_last_modified(r);

        }

        apr_table_setn(r->headers_out, "Accept-Ranges", "bytes");

        ap_set_accept_ranges(r);



        /* reflect the content length, if present */

        if ((content_length = apr_table_get(r->headers_in, "Content-Length"))) {

modules/http/http_protocol.c

+7 −0
Changes for modules/http/http_protocol.c: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -849,6 +849,13 @@ AP_DECLARE(void) ap_set_content_type(request_rec *r, const char *ct) 
    }

}



AP_DECLARE(void) ap_set_accept_ranges(request_rec *r)

{

    core_dir_config *d = ap_get_core_module_config(r->per_dir_config);

    apr_table_setn(r->headers_out, "Accept-Ranges",

                  (d->max_ranges == AP_MAXRANGES_NORANGES) ? "none"

                                                           : "bytes");

}

static const char *add_optional_notes(request_rec *r,

                                      const char *prefix,

                                      const char *key,