You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2002/12/12 13:50:22 UTC

cvs commit: httpd-2.0/modules/experimental config.m4

trawick     2002/12/12 04:50:22

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/experimental Tag: APACHE_2_0_BRANCH config.m4
  Log:
  merge this fix from Apache 2.1:
  
    *) Reorder the definitions for mod_ldap and mod_auth_ldap within
       config.m4 to make sure the parent mod_ldap is defined first.
       This ensures that mod_ldap comes before mod_auth_ldap in the
       httpd.conf file, which is necessary for mod_auth_ldap to load.
       PR 14256  [Graham Leggett]
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.10 +6 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.9
  retrieving revision 1.988.2.10
  diff -u -r1.988.2.9 -r1.988.2.10
  --- CHANGES	11 Dec 2002 17:59:24 -0000	1.988.2.9
  +++ CHANGES	12 Dec 2002 12:50:21 -0000	1.988.2.10
  @@ -1,5 +1,11 @@
   Changes with Apache 2.0.45
   
  +  *) Reorder the definitions for mod_ldap and mod_auth_ldap within
  +     config.m4 to make sure the parent mod_ldap is defined first.
  +     This ensures that mod_ldap comes before mod_auth_ldap in the
  +     httpd.conf file, which is necessary for mod_auth_ldap to load.
  +     PR 14256  [Graham Leggett]
  +
     *) Fix the building of cgi command lines when the query string
        contains '='.  PR 13914  [Ville Skytt� <vi...@iki.fi>,
        Jeff Trawick]
  
  
  
  1.751.2.20 +1 -8      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.19
  retrieving revision 1.751.2.20
  diff -u -r1.751.2.19 -r1.751.2.20
  --- STATUS	11 Dec 2002 18:14:15 -0000	1.751.2.19
  +++ STATUS	12 Dec 2002 12:50:22 -0000	1.751.2.20
  @@ -57,13 +57,6 @@
   
   PATCHES TO PORT FROM 2.1
   
  -    * Reorder the definitions for mod_ldap and mod_auth_ldap within
  -      config.m4 to make sure the parent mod_ldap is defined first.
  -      This ensures that mod_ldap comes before mod_auth_ldap in the
  -      httpd.conf file, which is necessary for mod_auth_ldap to load.
  -      PR 14256  [Graham Leggett]
  -      +1: trawick, wrowe, striker
  -
       * Rewrite how proxy sends its request to allow input bodies to 
         morph the request bodies.  Previously, if an input filter
         changed the request body, the original C-L would be sent which
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.24.2.1  +3 -1      httpd-2.0/modules/experimental/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/config.m4,v
  retrieving revision 1.24
  retrieving revision 1.24.2.1
  diff -u -r1.24 -r1.24.2.1
  --- config.m4	14 Nov 2002 20:24:03 -0000	1.24
  +++ config.m4	12 Dec 2002 12:50:22 -0000	1.24.2.1
  @@ -28,9 +28,11 @@
   APACHE_MODULE(example, example and demo module, , , no)
   APACHE_MODULE(case_filter, example uppercase conversion filter, , , no)
   APACHE_MODULE(case_filter_in, example uppercase conversion input filter, , , no)
  -APACHE_MODULE(auth_ldap, LDAP based authentication, , , no)
   
   ldap_objects="util_ldap.lo util_ldap_cache.lo util_ldap_cache_mgr.lo"
   APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects, , no)
  +
  +auth_ldap_objects="mod_auth_ldap.lo"
  +APACHE_MODULE(auth_ldap, LDAP based authentication, $auth_ldap_objects, , no)
   
   APACHE_MODPATH_FINISH