httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rainer Jung <rainer.j...@kippdata.de>
Subject Re: svn commit: r1153004 - /httpd/test/framework/trunk/t/conf/extra.conf.in
Date Tue, 02 Aug 2011 07:27:20 GMT
Hi Eric,

On 02.08.2011 04:51, covener@apache.org wrote:
> Author: covener
> Date: Tue Aug  2 02:51:19 2011
> New Revision: 1153004
> 
> URL: http://svn.apache.org/viewvc?rev=1153004&view=rev
> Log:
> whitespace change only to indent the block wrapped in a new ifModule in r1153003
> 
> 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=1153004&r1=1153003&r2=1153004&view=diff
> ==============================================================================
> --- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
> +++ httpd/test/framework/trunk/t/conf/extra.conf.in Tue Aug  2 02:51:19 2011
> @@ -699,27 +699,27 @@ LimitRequestFields    32
>     </IfModule>
>  
>     <IfModule mod_deflate.c>
> -   <Directory @SERVERROOT@/htdocs/modules/filter>
> -       Options +Includes
> -       AddType text/html .shtml
> -       AddOutputFilter INCLUDES .shtml
> -
> -       FilterDeclare pr49328 CONTENT_SET
> -       <IfVersion < 2.3.0> 
> -          <IfModule mod_deflate.c>
> -            FilterProvider pr49328 DEFLATE resp=Content-Type $text/
> -          </IfModule>
> -       </IfVersion>
> -       <IfVersion >= 2.3.0>
> -         <IfVersion < 2.3.9>
> -            FilterProvider pr49328 DEFLATE "$content-type = /text\//"
> +     <Directory @SERVERROOT@/htdocs/modules/filter>
> +         Options +Includes
> +         AddType text/html .shtml
> +         AddOutputFilter INCLUDES .shtml
> +
> +         FilterDeclare pr49328 CONTENT_SET
> +         <IfVersion < 2.3.0> 
> +            <IfModule mod_deflate.c>
> +              FilterProvider pr49328 DEFLATE resp=Content-Type $text/
> +            </IfModule>
>           </IfVersion>
> -       </IfVersion>
> -       <IfVersion >= 2.3.9>
> -          FilterProvider pr49328 DEFLATE "%{CONTENT_TYPE} =~ m!text/!"
> -       </IfVersion>
> -       FilterChain pr49328
> -   </Directory>
> +         <IfVersion >= 2.3.0>
> +           <IfVersion < 2.3.9>
> +              FilterProvider pr49328 DEFLATE "$content-type = /text\//"
> +           </IfVersion>
> +         </IfVersion>
> +         <IfVersion >= 2.3.9>
> +            FilterProvider pr49328 DEFLATE "%{CONTENT_TYPE} =~ m!text/!"
> +         </IfVersion>
> +         FilterChain pr49328
> +     </Directory>
>     </IfModule>
>  </IfModule>

Did you note, that there's already one IfModul around the FilterProvider
in the "<2.3.0" case? We should not need nested IfModule for the same
module.

Note that originally there was also an includes filter defined. It now
is no more if mod_deflate is not available. To see, what would be
correct, one would have to check, which tests are actually run against
this directory. Since it is called /modules/filter I expect, that
INCLUDE should stay active and only the DEFLATE activation should depend
on the existence of mod_deflate.

Regards,

Rainer

Mime
View raw message