Commit 4b6dfd4f authored by Stefan Eissing's avatar Stefan Eissing
Browse files

merged latest branches/2.4.x changes 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1703838 13f79535-47bb-0310-9956-ffa450edef68
parents c98a5c70 c326cf9c

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ Changes with Apache 2.4.17 
  *) mod_h2: added donated http/2 implementation to build system. Similar

     configuration options to mod_ssl. [Stefan Eissing]



  *) mod_autoindex: Allow autoindexes when neither mod_dir nor mod_mime are

     loaded. [Eric Covener]



  *) mod_rewrite:  Allow cookies set by mod_rewrite to contain ':' by accepting

     ';' as an alternate separator.  PR47241. 

     [<bugzilla schermesser com>, Eric Covener]

STATUS

+15 −12
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
  [ start all new proposals below, under PATCHES PROPOSED. ]







PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]
@@ -233,7 +232,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     PR 57785

     trunk: http://svn.apache.org/viewvc?view=revision&revision=1677702

     2.4.x: trunk patch applies.

     +1: niq

     +1: niq, jim



  *) core/mod_ssl: add Protocols/ProtocolsHonorOrder directives and new 

     protocols hooks to control Upgrade: and ALPN protocol switching.
@@ -270,16 +269,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     +1: icing, jim





  *) mod_rewrite: Fix an harmless error spotted by sparse.

     trunk: http://svn.apache.org/r1701545

     2.4.x: http://people.apache.org/~jailletc36/backport_2.4_r1701545.diff

     +1: jailletc36, ylavic





  *) mod_autoindex: Allow autoindexes to work without mod_dir or mod_mime

     trunk: http://svn.apache.org/r1701436

     2.4.x: trunk works

     +1: covener

  *) mod_slotmem_shm: Fix slots/SHM files names on restart for systems that

     can't create new (clear) slots while previous children gracefully stopping

     still use the old ones (e.g. Windows, OS2). PR 58024.

     trunk patch: http://svn.apache.org/r1702450

                  http://svn.apache.org/r1702473

                  http://svn.apache.org/r1702501

                  http://svn.apache.org/r1702955

                  http://svn.apache.org/r1703149

                  http://svn.apache.org/r1703157

                  http://svn.apache.org/r1703169

                  http://svn.apache.org/r1703200

     2.4.x patch: trunk works (module CHANGES)

     merge patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_slotmem_shm-generation.patch

     +1: ylavic, jim



PATCHES/ISSUES THAT ARE BEING WORKED

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