You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sc...@apache.org on 2009/11/29 17:45:55 UTC
svn commit: r885246 - /httpd/test/framework/trunk/t/conf/extra.conf.in
Author: sctemme
Date: Sun Nov 29 16:45:55 2009
New Revision: 885246
URL: http://svn.apache.org/viewvc?rev=885246&view=rev
Log:
The RewriteLock directive disappeared from the server as of this version. Work around this by leveraging mod_version, which is in the default module complement
Modified:
httpd/test/framework/trunk/t/conf/extra.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=885246&r1=885245&r2=885246&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/extra.conf.in Sun Nov 29 16:45:55 2009
@@ -171,7 +171,12 @@
RewriteEngine On
RewriteLog @SERVERROOT@/logs/rewrite_log
RewriteLogLevel 9
+ <IfVersion < 2.3.4>
RewriteLock @SERVERROOT@/logs/rewrite_lock
+ </IfVersion>
+ <IfVersion >= 2.3.4>
+ Mutex rewrite-map default
+ </IfVersion>
RewriteMap numbers-txt txt:@SERVERROOT@/htdocs/modules/rewrite/numbers.txt
RewriteMap numbers-rnd rnd:@SERVERROOT@/htdocs/modules/rewrite/numbers.rnd
#RewriteMap numbers-dbm dbm:@SERVERROOT@/htdocs/modules/rewrite/numbers.dbm
Re: svn commit: r885246 - /httpd/test/framework/trunk/t/conf/extra.conf.in
Posted by Jeff Trawick <tr...@gmail.com>.
On Sun, Nov 29, 2009 at 11:45 AM, <sc...@apache.org> wrote:
> Author: sctemme
> Date: Sun Nov 29 16:45:55 2009
> New Revision: 885246
>
> URL: http://svn.apache.org/viewvc?rev=885246&view=rev
> Log:
> The RewriteLock directive disappeared from the server as of this version. Work around this by leveraging mod_version, which is in the default module complement
>
> Modified:
> httpd/test/framework/trunk/t/conf/extra.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=885246&r1=885245&r2=885246&view=diff
> ==============================================================================
> --- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
> +++ httpd/test/framework/trunk/t/conf/extra.conf.in Sun Nov 29 16:45:55 2009
> @@ -171,7 +171,12 @@
> RewriteEngine On
> RewriteLog @SERVERROOT@/logs/rewrite_log
> RewriteLogLevel 9
> + <IfVersion < 2.3.4>
> RewriteLock @SERVERROOT@/logs/rewrite_lock
> + </IfVersion>
> + <IfVersion >= 2.3.4>
> + Mutex rewrite-map default
> + </IfVersion>
Whoops/thanks!
I think we can just drop the rewrite map mutex configuration
altogether for >= 2.3.4, unless some value is seen in testing that
configuration.
Without the configuration:
Old: no mutex, warn at startup if needed, behavior unreliable
Current: get mutex even with no prg maps configured, no unreliable behavior
When round tuit available: get mutex only if prg maps are configured