httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: apache-1.3/src CHANGES
Date Fri, 28 Feb 2003 13:36:04 GMT
nd          2003/02/28 05:36:04

  Modified:    .        Makefile.tmpl
               conf     httpd.conf-dist
               src      CHANGES
  Log:
  No objections, so put it in:
  Use the correct locations of srm.conf and access.conf when tailoring
  the httpd.conf during the install process.
  
  PR: 9446
  Submitted by: Stanislav Brabec <utx@penguin.cz>
  
  Revision  Changes    Path
  1.107     +2 -0      apache-1.3/Makefile.tmpl
  
  Index: Makefile.tmpl
  ===================================================================
  RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- Makefile.tmpl	3 Feb 2003 17:13:16 -0000	1.106
  +++ Makefile.tmpl	28 Feb 2003 13:36:03 -0000	1.107
  @@ -529,6 +529,8 @@
   			-e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \
   			-e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \
   			-e 's;conf/magic;$(sysconfdir)/magic;' \
  +			-e 's;conf/srm.conf;$(sysconfdir)/srm.conf;' \
  +			-e 's;conf/access.conf;$(sysconfdir)/access.conf;' \
   			-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
   			-e 's;User nobody;User $(conf_user);' \
   			-e 's;Group #-1;Group $(conf_group);' \
  
  
  
  1.83      +1 -1      apache-1.3/conf/httpd.conf-dist
  
  Index: httpd.conf-dist
  ===================================================================
  RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- httpd.conf-dist	4 Nov 2002 17:20:19 -0000	1.82
  +++ httpd.conf-dist	28 Feb 2003 13:36:03 -0000	1.83
  @@ -11,7 +11,7 @@
   # consult the online docs. You have been warned.  
   #
   # After this file is processed, the server will look for and process
  -# @@ServerRoot@@/conf/srm.conf and then @@ServerRoot@@/conf/access.conf
  +# conf/srm.conf and then conf/access.conf
   # unless you have overridden these with ResourceConfig and/or
   # AccessConfig directives here.
   #
  
  
  
  1.1883    +4 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1882
  retrieving revision 1.1883
  diff -u -r1.1882 -r1.1883
  --- CHANGES	22 Feb 2003 18:00:29 -0000	1.1882
  +++ CHANGES	28 Feb 2003 13:36:03 -0000	1.1883
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.28
   
  +  *) Use the correct locations of srm.conf and access.conf when tailoring
  +     the httpd.conf during the install process. PR 9446.
  +     [Stanislav Brabec <utx@penguin.cz>]
  +
     *) suexec: Be more pedantic when cleaning environment. Clean it
        immediately after startup. PR 2790, 10449.
        [Jeff Stewart <jws@purdue.edu>, André Malo]
  
  
  

Mime
View raw message