httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r652885 - in /httpd/httpd/trunk: CHANGES server/core.c
Date Fri, 02 May 2008 20:04:35 GMT
Author: rpluem
Date: Fri May  2 13:04:34 2008
New Revision: 652885

URL: http://svn.apache.org/viewvc?rev=652885&view=rev
Log:
* Do not allow all options of ALL to be set when only a few of them are
  allowed.

PR: 44262
Submitted by: Michał Grzędzicki <lazy iq.pl>
Reviewed by: rpluem

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=652885&r1=652884&r2=652885&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri May  2 13:04:34 2008
@@ -2,6 +2,10 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+
+  *) core: Do not allow Options ALL if not all options are allowed to be
+     overwritten. PR 44262 [Michał Grzędzicki <lazy iq.pl>]
+
   *) ap_cache_cacheable_headers_out() will (now) always
      merge an error heaeders _before_ clearing them and _before_
      merging in the actual entity headers and doing normal

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=652885&r1=652884&r2=652885&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Fri May  2 13:04:34 2008
@@ -1434,7 +1434,7 @@
             return apr_pstrcat(cmd->pool, "Illegal option ", w, NULL);
         }
 
-        if (!(cmd->override_opts & opt) && opt != OPT_NONE) {
+        if ( (cmd->override_opts & opt) != opt ) {
             return apr_pstrcat(cmd->pool, "Option ", w, " not allowed here", NULL);
         }
         else if (action == '-') {



Mime
View raw message