httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r390495 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/aaa/mod_authnz_ldap.c
Date Fri, 31 Mar 2006 20:31:45 GMT
Author: jim
Date: Fri Mar 31 12:31:43 2006
New Revision: 390495

URL: http://svn.apache.org/viewcvs?rev=390495&view=rev
Log:
  *) Fix mis-shifted 32 bit scope, masked to 64 bits as a method.
     [Will Rowe, Joe Orton]


Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/aaa/mod_authnz_ldap.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=390495&r1=390494&r2=390495&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Mar 31 12:31:43 2006
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.1
 
+  *) Fix mis-shifted 32 bit scope, masked to 64 bits as a method.
+     [Will Rowe, Joe Orton]
+
   *) mod_proxy: Fix KeepAlives not being allowed and set to
        backend servers. PR38602. [Ruediger Pluem, Jim Jagielski]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=390495&r1=390494&r2=390495&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Mar 31 12:31:43 2006
@@ -92,11 +92,6 @@
       +1: rpluem, niq, jerenkrantz
       NOTE: this also supersedes previous fix to PR#37790
 
-    * Fix mis-shifted 32 bit scope, masked to 64 bits as a method, with
-      improvement (?) suggested by jorton;
-        URL: http://people.apache.org/~wrowe/fixldap_mask.patch
-      +1: wrowe, pquerna, jim, jorton
-
     * mod_ldap: Fix a race condition when creating the connection pool mutex
 	and make sure that memory is being allocated from the correct pools
 	when connections are being established. Enforce the GLOBAL_ONLY 

Modified: httpd/httpd/branches/2.2.x/modules/aaa/mod_authnz_ldap.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/aaa/mod_authnz_ldap.c?rev=390495&r1=390494&r2=390495&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/mod_authnz_ldap.c (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/mod_authnz_ldap.c Fri Mar 31 12:31:43 2006
@@ -576,7 +576,7 @@
     /* Loop through the requirements array until there's no elements
      * left, or something causes a return from inside the loop */
     for(x=0; x < reqs_arr->nelts; x++) {
-        if (! (reqs[x].method_mask & (1 << m))) {
+        if (! (reqs[x].method_mask & (AP_METHOD_BIT << m))) {
             continue;
         }
         method_restricted = 1;



Mime
View raw message