Commit 1450721e authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1768070, r1768120, r1768225, r1769712, r1769737, r1774610, r1828624,... 

Merge r1768070, r1768120, r1768225, r1769712, r1769737, r1774610, r1828624, r1828626, r1855701 from trunk:

And the socache provider interface for Redis


And provide some nice usage stats. Could be prettier, for sure.

Needs LOGNO #s

reorganize mod_socache_redis so it compiles w/o apr-redis

It looks like this was the original intent. The provider
is not registered if apr-redis is missing.

It was previously failing to compile due to the dirconf being
hidden behind the #ifdef guard but not the routine module
code that used it.




Fix some HTML tags
</br> --> <br />

Couls also be <br> or <br/> but some (very) old clients don't like it.
httpd is not really consistent on it. (personnlaly <br> would be just fine for me but <br /> is the most commonly used form)

related to http://svn.apache.org/viewvc?view=revision&revision=1774602


Use apr_pcalloc in the 'create' function. All the fields are initialized in the 'init' function, but it is It is cleaner and more future proof.

Small style correction (remove extra spaces)

Initial doc for the sosache_redis module.

Corrections and improvements welcome.

Update compatibility notes for mod_socache_redis
Submitted by: jim, covener, jailletc36, jim, jailletc36, jailletc36, jailletc36
Reviewed by: jim, minfrin, covener


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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -185,6 +185,9 @@ Changes with Apache 2.4.36 
     should be accepted after the authorization scheme. \t are also tolerated.

     [Christophe Jaillet]



  *) mod_socache_redis: New socache submodule provider to allow use

     of Redis as storage backend. [Jim Jagielski]



  *) mod_proxy_hcheck: Fix issues with interval determination. PR 62318

     [Jim Jagielski]

STATUS

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

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



   *) Add in mod_socache_redis from trunk

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

             http://svn.apache.org/r1768120

             http://svn.apache.org/r1768225

             http://svn.apache.org/r1769712

             http://svn.apache.org/r1769737

             http://svn.apache.org/r1774610

             http://svn.apache.org/r1828624

             http://svn.apache.org/r1828626

      2.4.x patch: http://home.apache.org/~jim/patches/socache_redisv2.patch

      +1: jim, minfrin, covener

      jailletc36: r1855701 should be added to fix compatibility notes in the doc



  *) mod_log_config: Support %{c}h for conn-hostname, %h for useragent_host

     PR 55348

     trunk patch: https://svn.apache.org/r1730129

docs/manual/new_features_2_4.xml

+3 −0
Original line number Diff line number Diff line
@@ -196,6 +196,9 @@ 
      <dt><module>mod_md</module> (available since 2.4.30)</dt>

      <dd>Support the ACME protocol to automate certificate provisionning.</dd>



      <dt><module>mod_socache_redis</module> (available since 2.4.39)</dt>

      <dd>Support <a href="http://redis.io/">Redis</a> based shared object cache provider.</dd>



    </dl>

  </section>

docs/manual/socache.xml

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ 
    <dt>"memcache" (<module>mod_socache_memcache</module>)</dt>

    <dd>This makes use of the <a href="http://memcached.org/">memcached</a>

    high-performance, distributed memory object caching system.</dd>

    <dt>"redis" (<module>mod_socache_redis</module>)</dt>

    <dd>This makes use of the <a href="http://redis.io/">Redis</a>

    high-performance, distributed memory object caching system.</dd>

    <dt>"shmcb" (<module>mod_socache_shmcb</module>)</dt>

    <dd>This makes use of a high-performance cyclic buffer inside a

     shared memory segment.</dd>

modules/cache/config.m4

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ fi 
APACHE_MODULE(socache_shmcb,  shmcb small object cache provider, , , most)

APACHE_MODULE(socache_dbm, dbm small object cache provider, , , most)

APACHE_MODULE(socache_memcache, memcache small object cache provider, , , most)

APACHE_MODULE(socache_redis, redis small object cache provider, , , most)

APACHE_MODULE(socache_dc, distcache small object cache provider, , , no, [

    APACHE_CHECK_DISTCACHE

])