Commit f73f6077 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1602978, r1683044, r1683884, r1673368, r1701717, r1683047 from trunk: 

Core filters do not need mod_proxy.h

Small speed optimization when parsing <Limit>, <LimitExcept> and environment variables


Save a few bytes in conf pool

Remove some spaces between some return statements  and ';' + fix a strange formating in a 'for' loop

In order to save a few cycles, delay a hash table lookup which is not necessary needed

Constify + save a few bytes in conf pool
Submitted by: ylavic, jailletc36, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703405 13f79535-47bb-0310-9956-ffa450edef68
parent d4d45e85

STATUS

+0 −19
Original line number Diff line number Diff line
@@ -109,25 +109,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) Easy patches - synch with trunk

        - core: Core filters do not need mod_proxy.h

        - core: Small speed optimization when parsing <Limit>, <LimitExcept>

                and environment variables

        - mod_dav: Save a few bytes in conf pool

        - mod_proxy_http: Remove some spaces between some return statements

                          and ';' + fix a strange formating in a 'for' loop

        - mod_dav: Save a few cycles

        - mod_deflate: Constify + save a few bytes in conf pool

     trunk patch:

        http://svn.apache.org/r1602978

        http://svn.apache.org/r1683044

        http://svn.apache.org/r1683884

        http://svn.apache.org/r1673368

        http://svn.apache.org/r1701717

        http://svn.apache.org/r1683047

     2.4.x patch: trunk patchs work

     +1: jailletc36, ylavic, jim



  *) Easy patches - synch with trunk

     mod_negotiation: simplify type-map body tag lookup, and be safe

                      should it contain a NUL byte.

modules/dav/main/mod_dav.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static const char *dav_cmd_dav(cmd_parms *cmd, void *config, const char *arg1) 
        conf->provider = NULL;

    }

    else {

        conf->provider_name = apr_pstrdup(cmd->pool, arg1);

        conf->provider_name = arg1;

    }



    if (conf->provider_name != NULL) {

modules/dav/main/util.c

+2 −1
Original line number Diff line number Diff line
@@ -1823,10 +1823,11 @@ DAV_DECLARE(void) dav_add_vary_header(request_rec *in_req, 
     * so only do this check if there is a versioning provider */

    if (vsn_hooks != NULL) {

        const char *target = apr_table_get(in_req->headers_in, DAV_LABEL_HDR);

        const char *vary = apr_table_get(out_req->headers_out, "Vary");



        /* If Target-Selector specified, add it to the Vary header */

        if (target != NULL) {

            const char *vary = apr_table_get(out_req->headers_out, "Vary");



            if (vary == NULL)

                vary = DAV_LABEL_HDR;

            else

modules/filters/mod_deflate.c

+7 −7
Original line number Diff line number Diff line
@@ -62,9 +62,9 @@ typedef struct deflate_filter_config_t 
    int memlevel;

    int compressionlevel;

    apr_size_t bufferSize;

    char *note_ratio_name;

    char *note_input_name;

    char *note_output_name;

    const char *note_ratio_name;

    const char *note_input_name;

    const char *note_output_name;

} deflate_filter_config;



typedef struct deflate_dirconf_t {
@@ -261,16 +261,16 @@ static const char *deflate_set_note(cmd_parms *cmd, void *dummy, 
                                                    &deflate_module);



    if (arg2 == NULL) {

        c->note_ratio_name = apr_pstrdup(cmd->pool, arg1);

        c->note_ratio_name = arg1;

    }

    else if (!strcasecmp(arg1, "ratio")) {

        c->note_ratio_name = apr_pstrdup(cmd->pool, arg2);

        c->note_ratio_name = arg2;

    }

    else if (!strcasecmp(arg1, "input")) {

        c->note_input_name = apr_pstrdup(cmd->pool, arg2);

        c->note_input_name = arg2;

    }

    else if (!strcasecmp(arg1, "output")) {

        c->note_output_name = apr_pstrdup(cmd->pool, arg2);

        c->note_output_name = arg2;

    }

    else {

        return apr_psprintf(cmd->pool, "Unknown note type %s", arg1);

modules/proxy/mod_proxy_http.c

+6 −7
Original line number Diff line number Diff line
@@ -1156,8 +1156,7 @@ static void ap_proxy_read_headers(request_rec *r, request_rec *rr, 
            ++value;            /* Skip to start of value   */



        /* should strip trailing whitespace as well */

        for (end = &value[strlen(value)-1]; end > value && apr_isspace(*end); --

end)

        for (end = &value[strlen(value)-1]; end > value && apr_isspace(*end); --end)

            *end = '\0';



        /* make sure we add so as not to destroy duplicated headers