svn commit: r886177 - in /httpd/test/framework/trunk/t/conf: extra.conf.in ssl/ssl.conf.in

[tr...@apache.org]

Author: trawick
Date: Wed Dec  2 15:42:54 2009
New Revision: 886177

URL: http://svn.apache.org/viewvc?rev=886177&view=rev
Log:
Mutex directive updates:

mod_ssl's session cache mutex and mod_rewrite's rewrite map
mutex no longer have to be configured explicitly, so provide
only a commented-out version with explanation

strictly speaking, the ">= 2.3.4" check should really be
"> 2.3.4" since the syntax of the commented-out Mutex directive
reflects a change since 2.3.4 was tagged; keep it simple to
avoid needless perplexity in the future

Modified:
    httpd/test/framework/trunk/t/conf/extra.conf.in
    httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in

Modified: httpd/test/framework/trunk/t/conf/extra.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/extra.conf.in?rev=886177&r1=886176&r2=886177&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/extra.conf.in Wed Dec  2 15:42:54 2009
@@ -175,7 +175,10 @@
     RewriteLock @SERVERROOT@/logs/rewrite_lock
     </IfVersion>
     <IfVersion >= 2.3.4>
-    Mutex rewrite-map default
+    # mutex created automatically
+    # config needed only if file-based mutexes are used and
+    # default lock file dir is inappropriate
+    # Mutex file:/path/to/lockdir rewrite-map
     </IfVersion>
     RewriteMap numbers-txt txt:@SERVERROOT@/htdocs/modules/rewrite/numbers.txt
     RewriteMap numbers-rnd rnd:@SERVERROOT@/htdocs/modules/rewrite/numbers.rnd

Modified: httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in?rev=886177&r1=886176&r2=886177&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/ssl/ssl.conf.in Wed Dec  2 15:42:54 2009
@@ -11,7 +11,15 @@
     #SSLSessionCache        dbm:@ServerRoot@/logs/ssl_scache
     #SSLSessionCacheTimeout  300
 
+    <IfVersion < 2.3.4>
     #SSLMutex  file:@ServerRoot@/logs/ssl_mutex
+    </IfVersion>
+    <IfVersion >= 2.3.4>
+    # mutex created automatically
+    # config needed only if file-based mutexes are used and
+    # default lock file dir is inappropriate
+    # Mutex file:/path/to/lockdir ssl-cache
+    </IfVersion>
 
     SSLRandomSeed startup builtin
     SSLRandomSeed connect builtin

Re: svn commit: r886177 - in /httpd/test/framework/trunk/t/conf: extra.conf.in ssl/ssl.conf.in

[Jeff Trawick <tr...@gmail.com>]

On Wed, Dec 2, 2009 at 10:42 AM,  <tr...@apache.org> wrote:
> Author: trawick
> Date: Wed Dec  2 15:42:54 2009
> New Revision: 886177
>
> URL: http://svn.apache.org/viewvc?rev=886177&view=rev
> Log:
> Mutex directive updates:
>
> mod_ssl's session cache mutex and mod_rewrite's rewrite map
> mutex no longer have to be configured explicitly, so provide
> only a commented-out version with explanation

...

> +    <IfVersion >= 2.3.4>
> +    # mutex created automatically
> +    # config needed only if file-based mutexes are used and
> +    # default lock file dir is inappropriate
> +    # Mutex file:/path/to/lockdir ssl-cache

I misunderstood that there was no way to specify the path to the mutex
files just in case file-based mutexes were used.  But ap_parse_mutex()
has allowed "default:/path/to/lockdir" all along, and the new Mutex
directive code doesn't get in the way; thus, the way to update the
path to the mutex files just in case they are needed is simply "Mutex
default:/path/to/lockdir".

Secondly, the way to control the lock file dir in the test suite would
be via a single Mutex directive to cover mod_ssl, mod_rewrite, etc.;
that directive should be generated by
Apache-Test/lib/Apache/TestConfig.pm and not in module-specific config
snippets.

Sorry for the noise...