Commit 07d7963f authored by Stefan Eissing's avatar Stefan Eissing
Browse files

merged latest changes in 2.4.x 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1701801 13f79535-47bb-0310-9956-ffa450edef68
parents f830c9e7 8f46dc03

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ Changes with Apache 2.4.17 
  *) mod_authz_dbd: Avoid a crash when lacking correct DB access permissions.

     PR 57868. [Jose Kahan <jose w3.org>, Yann Ylavic]



  *) mod_socache_memcache: Add the 'MemcacheConnTTL' directive to control how 

     long to keep idle connections with the memcache server(s).

     Change default value from 600 usec (!) to 15 sec. PR 58091

     [Christophe Jaillet]



  *) mod_dir: Prevent the internal identifier "httpd/unix-directory" from

     appearing as a Content-Type response header when requests for a directory

     are rewritten by mod_rewrite. [Eric Covener]

STATUS

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

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



  *) mod_socache_memcache: Add the 'MemcacheConnTTL' directive to control how 

     long to keep idle connections with the memcache server(s).

     Change default value from 600 usec (!) to 15 sec.  PR 58091

     Measurements available in the svn commit message.

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

            http://svn.apache.org/r1700418

     2.4.x: http://people.apache.org/~jailletc36/socache_memcache.diff

     +1: jailletc36, ylavic, covener

     covener: please add compatibility tag to doc during backport

     jailletc36: done in r1700418





  *) Fix some spurious and/or inconsistant indent spotted by sparse

     Fix some minor style issues.

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

            http://svn.apache.org/r1700318

            http://svn.apache.org/r1700319

            http://svn.apache.org/r1700320

            http://svn.apache.org/r1700321

            http://svn.apache.org/r1700322

            http://svn.apache.org/r1700326

            http://svn.apache.org/r1700328

            http://svn.apache.org/r1700330

            http://svn.apache.org/r1700331

            http://svn.apache.org/r1700332

            http://svn.apache.org/r1700334

            http://svn.apache.org/r1700336

            http://svn.apache.org/r1700338

     2.4.x: http://people.apache.org/~jailletc36/sparse.diff

     +1: jailletc36, ylavic, covener

     jailletc36: To ease review http://people.apache.org/~jailletc36/sparse_nospace.diff

                 is the same file as above but generated using svn diff -x --ignore-all-space





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

docs/manual/mod/mod_socache_memcache.xml

+39 −0
Original line number Diff line number Diff line
@@ -52,4 +52,43 @@ 


</summary>



<directivesynopsis>

<name>MemcacheConnTTL</name>

<description>Keepalive time for idle connections</description>

<syntax>MemcacheConnTTL <em>num[units]</em></syntax>

<default>MemcacheConnTTL 15s</default>

<contextlist>

<context>server config</context>

<context>virtual host</context>

</contextlist>

<compatibility>Available in Apache 2.4.17 and later</compatibility>



<usage>



    <p>Set the time to keep idle connections with the memcache server(s)

    alive (threaded platforms only).</p>

    

    <p>Valid values for <directive>MemcacheConnTTL</directive> are times

    up to one hour. 0 means no timeout.</p>



    <note><p>This timeout defaults to units of seconds, but accepts

    suffixes for milliseconds (ms), seconds (s), minutes (min), and hours (h).

    </p></note>



    <p>Before Apache 2.4.17, this timeout was hardcoded and its value was 600 usec.

    So, the closest configuration to match the legacy behaviour is to set

    <directive>MemcacheConnTTL</directive> to 1ms.</p>



    <example>

    <highlight language="config">

# Set a timeout of 10 minutes

MemcacheConnTTL 10min

# Set a timeout of 60 seconds

MemcacheConnTTL 60

    </highlight>

    </example>



</usage>

</directivesynopsis>



</modulesynopsis>

modules/cache/mod_cache_disk.c

+8 −6
Original line number Diff line number Diff line
@@ -185,7 +185,8 @@ static apr_status_t file_cache_el_final(disk_cache_conf *conf, disk_cache_file_t 
    return rv;

}



static apr_status_t file_cache_temp_cleanup(void *dummy) {

static apr_status_t file_cache_temp_cleanup(void *dummy)

{

    disk_cache_file_t *file = (disk_cache_file_t *)dummy;



    /* clean up the temporary file */
@@ -1382,7 +1383,8 @@ static void *create_dir_config(apr_pool_t *p, char *dummy) 
    return dconf;

}



static void *merge_dir_config(apr_pool_t *p, void *basev, void *addv) {

static void *merge_dir_config(apr_pool_t *p, void *basev, void *addv)

{

    disk_cache_dir_conf *new = (disk_cache_dir_conf *) apr_pcalloc(p, sizeof(disk_cache_dir_conf));

    disk_cache_dir_conf *add = (disk_cache_dir_conf *) addv;

    disk_cache_dir_conf *base = (disk_cache_dir_conf *) basev;

modules/cache/mod_cache_socache.c

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ static apr_status_t read_table(cache_handle_t *handle, request_rec *r, 
        apr_size_t *slider)

{

    apr_size_t key = *slider, colon = 0, len = 0;

    ;



    while (*slider < buffer_len) {

        if (buffer[*slider] == ':') {