httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@rowe-clan.net>
Subject Re: Tagged the tree
Date Mon, 09 Sep 2002 23:27:11 GMT
Sander (& Co)

   with .40, we backed out the apr-iconv due to it's not-ready state,
with the attached patch.

   I've been intending to get the openssl/iconv/zlib library linkage stubs
done for Win32, but my time's been rather short.  I should be able
to attack it late this week or early next week, but if we want to roll
out .41 without the lib-linkage foo, can we please reapply this patch
for the short-term hack?

   It looks like backing it out isn't an issue today though, given the
memory leak on every request.  That one seems like a showstopper
to me.

Bill


>wrowe       2002/08/09 08:01:45
>
>   Modified:    .        Apache.dsw Makefile.win
>                include  apu.hw
>   Log:
>     Since library detection is _not_ complete, and this code is extremely
>     alpha quality, backout the apr-iconv for Win32 changes from the .40
>     release.  Many have objected [not -1 exactly] to forcing iconv for any
>     user to build xlate, and the detection/fixup patches are a blocker for
>     releasing this overdue version.
>
>     Recommiting immediately after tagging this sans-iconv point for .40, and
>     create a patch anyone can apply to enable this for the release tarball.
>
>   Revision  Changes    Path
>   1.85      +0 -60     httpd-2.0/Apache.dsw
>
>   Index: Apache.dsw
>   ===================================================================
>   RCS file: /home/cvs/httpd-2.0/Apache.dsw,v
>   retrieving revision 1.84
>   retrieving revision 1.85
>   diff -u -r1.84 -r1.85
>   --- Apache.dsw        20 Jul 2002 23:57:26 -0000      1.84
>   +++ Apache.dsw        9 Aug 2002 15:01:45 -0000       1.85
>   @@ -90,9 +90,6 @@
>        Project_Dep_Name mod_cgi
>        End Project Dependency
>        Begin Project Dependency
>   -    Project_Dep_Name mod_charset_lite
>   -    End Project Dependency
>   -    Begin Project Dependency
>        Project_Dep_Name mod_dav_fs
>        End Project Dependency
>        Begin Project Dependency
>   @@ -264,18 +261,6 @@
>
> 
>###############################################################################
>
>   -Project: "apriconv"=".\srclib\apr-iconv\apriconv.dsp" - Package Owner=<4>
>   -
>   -Package=<5>
>   -{{{
>   -}}}
>   -
>   -Package=<4>
>   -{{{
>   -}}}
>   -
> 
>-###############################################################################
>   -
>    Project: "aprutil"=".\srclib\apr-util\aprutil.dsp" - Package Owner=<4>
>
>    Package=<5>
>   @@ -285,9 +270,6 @@
>    Package=<4>
>    {{{
>        Begin Project Dependency
>   -    Project_Dep_Name apriconv
>   -    End Project Dependency
>   -    Begin Project Dependency
>        Project_Dep_Name gen_uri_delims
>        End Project Dependency
>        Begin Project Dependency
>   @@ -402,21 +384,6 @@
>
> 
>###############################################################################
>
>   -Project: "libapriconv"=".\srclib\apr-iconv\libapriconv.dsp" - Package 
> Owner=<4>
>   -
>   -Package=<5>
>   -{{{
>   -}}}
>   -
>   -Package=<4>
>   -{{{
>   -    Begin Project Dependency
>   -    Project_Dep_Name libapr
>   -    End Project Dependency
>   -}}}
>   -
> 
>-###############################################################################
>   -
>    Project: "libaprutil"=".\srclib\apr-util\libaprutil.dsp" - Package 
> Owner=<4>
>
>    Package=<5>
>   @@ -429,9 +396,6 @@
>        Project_Dep_Name libapr
>        End Project Dependency
>        Begin Project Dependency
>   -    Project_Dep_Name libapriconv
>   -    End Project Dependency
>   -    Begin Project Dependency
>        Project_Dep_Name gen_uri_delims
>        End Project Dependency
>        Begin Project Dependency
>   @@ -453,9 +417,6 @@
>        Project_Dep_Name libapr
>        End Project Dependency
>        Begin Project Dependency
>   -    Project_Dep_Name libapriconv
>   -    End Project Dependency
>   -    Begin Project Dependency
>        Project_Dep_Name libaprutil
>        End Project Dependency
>        Begin Project Dependency
>   @@ -718,27 +679,6 @@
> 
>###############################################################################
>
>    Project: "mod_cgi"=".\modules\generators\mod_cgi.dsp" - Package Owner=<4>
>   -
>   -Package=<5>
>   -{{{
>   -}}}
>   -
>   -Package=<4>
>   -{{{
>   -    Begin Project Dependency
>   -    Project_Dep_Name libapr
>   -    End Project Dependency
>   -    Begin Project Dependency
>   -    Project_Dep_Name libaprutil
>   -    End Project Dependency
>   -    Begin Project Dependency
>   -    Project_Dep_Name libhttpd
>   -    End Project Dependency
>   -}}}
>   -
> 
>-###############################################################################
>   -
>   -Project: 
> "mod_charset_lite"=".\modules\experimental\mod_charset_lite.dsp" - 
> Package Owner=<4>
>
>    Package=<5>
>    {{{
>
>
>
>   1.115     +4 -14     httpd-2.0/Makefile.win
>
>   Index: Makefile.win
>   ===================================================================
>   RCS file: /home/cvs/httpd-2.0/Makefile.win,v
>   retrieving revision 1.114
>   retrieving revision 1.115
>   diff -u -r1.114 -r1.115
>   --- Makefile.win      30 Jul 2002 17:07:44 -0000      1.114
>   +++ Makefile.win      9 Aug 2002 15:01:45 -0000       1.115
>   @@ -31,12 +31,13 @@
>    CTARGET=/build
>    !ENDIF
>
>   -!IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util") || 
> !EXIST("srclib\apr-iconv")
>   +!IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util")
>   +## || !EXIST("srclib\apr-iconv")
>    !MESSAGE Please check out or download and unpack the Apache 
> Portability Runtime
>   -!MESSAGE sources (apr, apr-iconv and apr-util) into your 
> $(INSTDIR)\srclib dir.
>   +!MESSAGE sources (apr and apr-util) into your $(INSTDIR)\srclib dir.
>    !MESSAGE Apache cannot build without these libraries!
>    !MESSAGE
>   -!ERROR Need $(INSTDIR)\srclib\  apr, apr-iconv and apr-util
>   +!ERROR Need $(INSTDIR)\srclib\  apr and apr-util
>    !ENDIF
>
>    # Note; _tryssl: is only used by the msvc developer studio environment 
> to 'fix up'
>   @@ -174,10 +175,6 @@
>         $(MAKE) $(MAKEOPT) -f apr.mak             CFG="apr - Win32 
> $(LONG)" RECURSE=0 $(CTARGET)
>         $(MAKE) $(MAKEOPT) -f libapr.mak          CFG="libapr - Win32 
> $(LONG)" RECURSE=0 $(CTARGET)
>         cd ..\..
>   -     cd srclib\apr-iconv
>   -     $(MAKE) $(MAKEOPT) -f apriconv.mak  CFG="apriconv - Win32 
> $(LONG)" RECURSE=0 $(CTARGET)
>   -     $(MAKE) $(MAKEOPT) -f libapriconv.mak  CFG="libapriconv - Win32 
> $(LONG)" RECURSE=0 $(CTARGET)
>   -     cd ..\..
>         cd srclib\apr-util\uri
>         $(MAKE) $(MAKEOPT) -f gen_uri_delims.mak  CFG="gen_uri_delims - 
> Win32 $(LONG)" RECURSE=0 $(CTARGET)
>         cd ..\..\..
>   @@ -218,7 +215,6 @@
>         cd ..\..\..
>         cd modules\experimental
>         $(MAKE) $(MAKEOPT) -f mod_cache.mak       CFG="mod_cache - Win32 
> $(LONG)" RECURSE=0 $(CTARGET)
>   -     $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite 
> - Win32 $(LONG)" RECURSE=0 $(CTARGET)
>         $(MAKE) $(MAKEOPT) -f mod_mem_cache.mak   CFG="mod_mem_cache - 
> Win32 $(LONG)" RECURSE=0 $(CTARGET)
>         $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak  CFG="mod_disk_cache - 
> Win32 $(LONG)" RECURSE=0 $(CTARGET)
>         $(MAKE) $(MAKEOPT) -f mod_ext_filter.mak  CFG="mod_ext_filter - 
> Win32 $(LONG)" RECURSE=0 $(CTARGET)
>   @@ -357,7 +353,6 @@
>         copy $(LONG)\Apache.exe "$(INSTDIR)\bin" <.y
>         copy $(LONG)\libhttpd.dll "$(INSTDIR)\bin" <.y
>         copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)\bin" <.y
>   -     copy srclib\apr-iconv\$(LONG)\libapriconv.dll "$(INSTDIR)\bin" <.y
>         copy srclib\apr-util\$(LONG)\libaprutil.dll "$(INSTDIR)\bin" <.y
>         copy modules\aaa\$(LONG)\mod_access.so "$(INSTDIR)\modules" <.y
>         copy modules\aaa\$(LONG)\mod_auth.so "$(INSTDIR)\modules" <.y
>   @@ -369,7 +364,6 @@
>         copy modules\dav\fs\$(LONG)\mod_dav_fs.so "$(INSTDIR)\modules" <.y
>         copy modules\dav\main\$(LONG)\mod_dav.so "$(INSTDIR)\modules" <.y
>         copy modules\experimental\$(LONG)\mod_cache.so 
> "$(INSTDIR)\modules" <.y
>   -     copy modules\experimental\$(LONG)\mod_charset_lite.so 
> "$(INSTDIR)\modules" <.y
>         copy modules\experimental\$(LONG)\mod_mem_cache.so 
> "$(INSTDIR)\modules" <.y
>         copy modules\experimental\$(LONG)\mod_disk_cache.so 
> "$(INSTDIR)\modules" <.y
>         copy modules\experimental\$(LONG)\mod_ext_filter.so 
> "$(INSTDIR)\modules" <.y
>   @@ -406,7 +400,6 @@
>         copy $(LONG)\Apache.pdb "$(INSTDIR)\bin" <.y
>         copy $(LONG)\libhttpd.pdb "$(INSTDIR)\bin" <.y
>         copy srclib\apr\$(LONG)\libapr.pdb "$(INSTDIR)\bin" <.y
>   -     copy srclib\apr-iconv\$(LONG)\libapriconv.pdb "$(INSTDIR)\bin" <.y
>         copy srclib\apr-util\$(LONG)\libaprutil.pdb "$(INSTDIR)\bin" <.y
>         copy modules\aaa\$(LONG)\mod_access.pdb "$(INSTDIR)\modules" <.y
>         copy modules\aaa\$(LONG)\mod_auth.pdb "$(INSTDIR)\modules" <.y
>   @@ -418,7 +411,6 @@
>         copy modules\dav\fs\$(LONG)\mod_dav_fs.pdb "$(INSTDIR)\modules" <.y
>         copy modules\dav\main\$(LONG)\mod_dav.pdb "$(INSTDIR)\modules" <.y
>         copy modules\experimental\$(LONG)\mod_cache.pdb 
> "$(INSTDIR)\modules" <.y
>   -     copy modules\experimental\$(LONG)\mod_charset_lite.pdb 
> "$(INSTDIR)\modules" <.y
>         copy modules\experimental\$(LONG)\mod_mem_cache.pdb 
> "$(INSTDIR)\modules" <.y
>         copy modules\experimental\$(LONG)\mod_disk_cache.pdb 
> "$(INSTDIR)\modules" <.y
>         copy modules\experimental\$(LONG)\mod_ext_filter.pdb 
> "$(INSTDIR)\modules" <.y
>   @@ -611,8 +603,6 @@
>         copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml.lib 
> "$(INSTDIR)\lib\expat.lib" <.y
>         copy srclib\apr\$(LONG)\libapr.lib "$(INSTDIR)\lib" <.y
>         copy srclib\apr\$(LONG)\libapr.exp "$(INSTDIR)\lib" <.y
>   -     copy srclib\apr-iconv\$(LONG)\libapriconv.lib "$(INSTDIR)\lib" <.y
>   -     copy srclib\apr-iconv\$(LONG)\libapriconv.exp "$(INSTDIR)\lib" <.y
>         copy srclib\apr-util\$(LONG)\libaprutil.lib "$(INSTDIR)\lib" <.y
>         copy srclib\apr-util\$(LONG)\libaprutil.exp "$(INSTDIR)\lib" <.y
>         copy $(LONG)\libhttpd.exp "$(INSTDIR)\lib" <.y
>
>
>
>   1.10      +1 -1      apr-util/include/apu.hw
>
>   Index: apu.hw
>   ===================================================================
>   RCS file: /home/cvs/apr-util/include/apu.hw,v
>   retrieving revision 1.9
>   retrieving revision 1.10
>   diff -u -r1.9 -r1.10
>   --- apu.hw    20 Jul 2002 22:33:01 -0000      1.9
>   +++ apu.hw    9 Aug 2002 15:01:45 -0000       1.10
>   @@ -154,7 +154,7 @@
>    #endif
>    #endif
>
>   -#define APU_HAVE_APR_ICONV     1
>   +#define APU_HAVE_APR_ICONV     0
>    #define APU_HAVE_ICONV         0
>    #define APR_HAS_XLATE          (APU_HAVE_APR_ICONV || APU_HAVE_ICONV)
>
>
>
>



Mime
View raw message