"William A. Rowe, Jr." <[EMAIL PROTECTED]> writes: > At 06:50 AM 11/22/2002, Jeff Trawick wrote: > >[EMAIL PROTECTED] writes: > > > >> wrowe 2002/11/21 18:08:42 > >> > >> Modified: include ap_release.h > >> Log: > >> Branch tag APACHE_2_0_BRANCH now contains Apache 2.0 development. > >> > >> Persist cvs HEAD as Apache 2.1. > >> > >> After discussion at AC, a number of individuals including Sander, Will, > >> Justin and Rich will begin reverting the appropriate changes from the > >> APACHE_2_0_BRANCH, while continuing their documentation and development > >> of the Authorization reorganization on this branch. > > > >Does "reverting the appropriate changes" mean "decide which stuff > >now tagged APACHE_2_0_BRANCH should be deferred until 2.1" or does it > >mean "as fixes are committed to HEAD, decide which of them should be > >available in Apache 2.0" or does it mean something else? > > No. After Sander's comments, APACHE_2_0_BRANCH is now from CVS > head. We can selectively revert those changes that break compatibility, > introduce potential buggyness, or simply aren't complete.
That sounds a lot like "decide which stuff now tagged APACHE_2_0_BRANCH should be deferred until 2.1" :) (or at least "deferred until after 2.0.44"). looking over diffs from APACHE_2_0_43 to APACHE_2_0_BRANCH: . auth changes: IIRC, smart people decided the auth changes aren't going to hurt anybody, so that's okay with me . everything else: keep it in APACHE_2_0_BRANCH looking over diffs from APACHE_2_0_BRANCH to HEAD: . netware build changes: no opinion, but I don't see how it is going to hurt anything . LDAP changes to treat one API like another: no opinion, but I don't see how it is going to hurt anything this is: *) Replace APU_HAS_LDAPSSL_CLIENT_INIT with APU_HAS_LDAP_NETSCAPE_SSL as set by apr-util in util_ldap.c. This should allow mod_ldap to work with the Netscape/Mozilla LDAP library. [Øyvin Sømme <[EMAIL PROTECTED]>, Graham Leggett] . everything else: needs to be in APACHE_2_0_BRANCH IMHO this includes *) Fix the building of cgi command lines when the query string contains '='. PR 13914 [Ville Skyttä <[EMAIL PROTECTED]>, Jeff Trawick] *) 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 critical bug in new --enable-v4-mapped configure option implementation which broke IPv4 listening sockets on some systems. [hiroyuki hanai <[EMAIL PROTECTED]>] as well as some doc fixes -- Jeff Trawick | [EMAIL PROTECTED] Born in Roswell... married an alien...