httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@locus.apache.org
Subject cvs commit: apache-2.0/conf httpd.conf-dist httpd.conf-dist-win
Date Sat, 19 Aug 2000 05:50:30 GMT
fanf        00/08/18 22:50:30

  Modified:    conf     httpd.conf-dist httpd.conf-dist-win
  Log:
  Remove the obsolete ResourceConfig and AccessConfig directives
  
  Revision  Changes    Path
  1.13      +0 -17     apache-2.0/conf/httpd.conf-dist
  
  Index: httpd.conf-dist
  ===================================================================
  RCS file: /home/cvs/apache-2.0/conf/httpd.conf-dist,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -u -r1.12 -r1.13
  --- httpd.conf-dist	2000/08/19 05:47:41	1.12
  +++ httpd.conf-dist	2000/08/19 05:50:28	1.13
  @@ -10,11 +10,6 @@
   # what they do.  They're here only as hints or reminders.  If you are unsure
   # 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
  -# unless you have overridden these with ResourceConfig and/or
  -# AccessConfig directives here.
  -#
   # The configuration directives are grouped into three basic sections:
   #  1. Directives that control the operation of the Apache server process as a
   #     whole (the 'global environment').
  @@ -80,18 +75,6 @@
   <IfModule !dexter.c>
   ScoreBoardFile logs/apache_runtime_status
   </IfModule>
  -
  -#
  -# In the standard configuration, the server will process this file,
  -# srm.conf, and access.conf in that order.  The latter two files are
  -# now distributed empty, as it is recommended that all directives
  -# be kept in a single file for simplicity.  The commented-out values
  -# below are the built-in defaults.  You can have the server ignore
  -# these files altogether by using "/dev/null" (for Unix) or
  -# "nul" (for Win32) for the arguments to the directives.
  -#
  -#ResourceConfig conf/srm.conf
  -#AccessConfig conf/access.conf
   
   #
   # Timeout: The number of seconds before receives and sends time out.
  
  
  
  1.9       +0 -17     apache-2.0/conf/httpd.conf-dist-win
  
  Index: httpd.conf-dist-win
  ===================================================================
  RCS file: /home/cvs/apache-2.0/conf/httpd.conf-dist-win,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -u -r1.8 -r1.9
  --- httpd.conf-dist-win	2000/05/09 23:29:41	1.8
  +++ httpd.conf-dist-win	2000/08/19 05:50:29	1.9
  @@ -10,11 +10,6 @@
   # what they do.  They're here only as hints or reminders.  If you are unsure
   # 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
  -# unless you have overridden these with ResourceConfig and/or
  -# AccessConfig directives here.
  -#
   # The configuration directives are grouped into three basic sections:
   #  1. Directives that control the operation of the Apache server process as a
   #     whole (the 'global environment').
  @@ -69,18 +64,6 @@
   # no two invocations of Apache share the same scoreboard file.
   #
   #ScoreBoardFile logs/apache_status
  -
  -#
  -# In the standard configuration, the server will process httpd.conf,
  -# srm.conf, and access.conf in that order.  The latter two files are
  -# now distributed empty, as it is recommended that all directives
  -# be kept in a single file for simplicity.  The commented-out values
  -# below are the built-in defaults.  You can have the server ignore
  -# these files altogether by using "/dev/null" (for Unix) or
  -# "nul" (for Win32) for the arguments to the directives.
  -#
  -#ResourceConfig conf/srm.conf
  -#AccessConfig conf/access.conf
   
   #
   # Timeout: The number of seconds before receives and sends time out.
  
  
  

Mime
View raw message