httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: httpd-2.0/docs/conf httpd-std.conf
Date Thu, 11 Oct 2001 03:42:53 GMT
rbb         01/10/10 20:42:53

  Modified:    .        CHANGES Makefile.in STATUS acinclude.m4
               docs/conf httpd-std.conf
  Log:
  Fixed the configure script to add a LoadModule directive to
  the default httpd.conf for any module that was compiled
  as a DSO.
  
  Submitted by:	Aaron Bannert <aaron@clove.org>
  
  Revision  Changes    Path
  1.388     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.387
  retrieving revision 1.388
  diff -u -r1.387 -r1.388
  --- CHANGES	2001/10/11 01:49:21	1.387
  +++ CHANGES	2001/10/11 03:42:52	1.388
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.26-dev
   
  +  *) Fixed the configure script to add a LoadModule directive to
  +     the default httpd.conf for any module that was compiled
  +     as a DSO.       [Aaron Bannert <aaron@clove.org>]
  +
     *) rewrite mod_ssl input filtering to work with the new input filtering
        system.  [Justin Erenkrantz]
   
  
  
  
  1.88      +25 -3     httpd-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.in,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- Makefile.in	2001/10/08 10:15:37	1.87
  +++ Makefile.in	2001/10/11 03:42:53	1.88
  @@ -36,9 +36,31 @@
   	done; \
   	for i in *-std* ldap.conf proxy.conf ssl.conf; do \
   		[ -f $$i ] || continue; \
  -		sed -e 's#@@ServerRoot@@#$(prefix)#g' \
  -		    -e 's#@@Port@@#$(PORT)#g' \
  -			< $$i > $(sysconfdir)/$$i; \
  +		( \
  +			n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
  +			if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
  +				sed -e 's#@@ServerRoot@@#$(prefix)#g' \
  +					-e 's#@@Port@@#$(PORT)#g' \
  +					-e '/@@LoadModule@@/d' \
  +					< $$i; \
  +			else \
  +				sed -n -e '/@@LoadModule@@/q' \
  +					-e 's#@@ServerRoot@@#$(prefix)#g' \
  +					-e 's#@@Port@@#$(PORT)#g' \
  +					-e 'p' \
  +					< $$i; \
  +				for j in $(DSO_MODULES) "^EOL^"; do \
  +					if test $$j != "^EOL^"; then \
  +						echo "LoadModule $${j}_module modules/mod_$${j}.so"; \
  +					fi; \
  +				done; \
  +				sed -e '1,/@@LoadModule@@/d' \
  +					-e '/@@LoadModule@@/d' \
  +					-e 's#@@ServerRoot@@#$(prefix)#g' \
  +					-e 's#@@Port@@#$(PORT)#g' \
  +					< $$i; \
  +			fi \
  +		) > $(sysconfdir)/$$i; \
   		chmod 0644 $(sysconfdir)/$$i; \
   		file=`echo $$i|sed s/-std//`; \
   		if [ "$$file" = "httpd.conf" ]; then \
  
  
  
  1.305     +1 -5      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.304
  retrieving revision 1.305
  diff -u -r1.304 -r1.305
  --- STATUS	2001/10/11 01:49:21	1.304
  +++ STATUS	2001/10/11 03:42:53	1.305
  @@ -1,5 +1,5 @@
   APACHE 2.0 STATUS:						-*-text-*-
  -Last modified at [$Date: 2001/10/11 01:49:21 $]
  +Last modified at [$Date: 2001/10/11 03:42:53 $]
   
   Release:
   
  @@ -82,10 +82,6 @@
         Bill would be happy with changing MaxClients to MaxServers
         to make it agree with the operation of the StartServers
         directive.
  -
  -    * Fix the configure script to add a LoadModule directive to
  -      the default httpd.conf for any module that was compiled
  -      as a DSO.
   
       * revamp the input filter semantics, per discussions since
         February (and especially at the hackathon last
  
  
  
  1.103     +4 -1      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- acinclude.m4	2001/10/03 17:47:50	1.102
  +++ acinclude.m4	2001/10/11 03:42:53	1.103
  @@ -94,6 +94,7 @@
     APACHE_SUBST(SH_LIBTOOL)
     APACHE_SUBST(MK_IMPLIB)
     APACHE_SUBST(INSTALL_PROG_FLAGS)
  +  APACHE_SUBST(DSO_MODULES)
   
     abs_srcdir="`(cd $srcdir && pwd)`"
   
  @@ -259,7 +260,9 @@
       shared*)
         enable_$1=`echo $ac_n $enable_$1$ac_c|sed 's/shared,*//'`
         sharedobjs=yes
  -      shared=yes;;
  +      shared=yes
  +      DSO_MODULES="$DSO_MODULES $1"
  +      ;;
       *)
         MODLIST="$MODLIST ifelse($4,,$1,$4)"
         if test "$1" = "so"; then
  
  
  
  1.57      +3 -26     httpd-2.0/docs/conf/httpd-std.conf
  
  Index: httpd-std.conf
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- httpd-std.conf	2001/10/05 03:32:42	1.56
  +++ httpd-std.conf	2001/10/11 03:42:53	1.57
  @@ -193,32 +193,9 @@
   # Statically compiled modules (those listed by `httpd -l') do not need
   # to be loaded here.
   #
  -#LoadModule auth_anon_module modules/mod_auth_anon.so
  -#LoadModule auth_db_module modules/mod_auth_db.so
  -#LoadModule auth_dbm_module modules/mod_auth_dbm.so
  -#LoadModule auth_digest_module modules/mod_auth_digest.so
  -#LoadModule cern_meta_module modules/mod_cern_meta.so
  -#LoadModule dav_module modules/mod_dav.so
  -#LoadModule dav_fs_module modules/mod_dav_fs.so
  -#LoadModule expires_module modules/mod_expires.so
  -#LoadModule file_cache_module modules/mod_file_cache.so
  -#LoadModule headers_module modules/mod_headers.so
  -#LoadModule info_module modules/mod_info.so
  -#LoadModule ldap_module modules/mod_ldap.so
  -#LoadModule auth_ldap_module modules/mod_auth_ldap.so
  -#LoadModule mime_magic_module modules/mod_mime_magic.so
  -#LoadModule proxy_module modules/mod_proxy.so
  -#LoadModule proxy_connect_module modules/proxy_connect.so
  -#LoadModule proxy_http_module modules/proxy_http.so
  -#LoadModule proxy_ftp_module modules/proxy_ftp.so
  -#LoadModule rewrite_module modules/mod_rewrite.so
  -#LoadModule ssl_module modules/mod_ssl.so
  -#LoadModule speling_module modules/mod_speling.so
  -#LoadModule suexec_module modules/mod_suexec.so
  -#LoadModule status_module modules/mod_status.so
  -#LoadModule unique_id_module modules/mod_unique_id.so
  -#LoadModule usertrack_module modules/mod_usertrack.so
  -#LoadModule vhost_alias_module modules/mod_vhost_alias.so
  +# Example:
  +# LoadModule foo_module modules/mod_foo.so
  +@@LoadModule@@
   
   #
   # ExtendedStatus controls whether Apache will generate "full" status
  
  
  

Mime
View raw message