Return-Path: 
 <cvs-return-11234-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 96413 invoked by uid 500); 23 Apr 2002 22:42:04 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
list-post: <mailto:cvs@httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 96401 invoked by uid 500); 23 Apr 2002 22:42:04 -0000
Delivered-To: apmail-httpd-2.0-cvs@apache.org
Date: 23 Apr 2002 22:42:04 -0000
Message-ID: <20020423224204.77007.qmail@icarus.apache.org>
From: jerenkrantz@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/docs/conf httpd-std.conf.in
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jerenkrantz    02/04/23 15:42:03

  Modified:    .        CHANGES
               docs/conf httpd-std.conf.in
  Log:
  Switch to using new exp_* macros to fix disjointedness problems.
  
  PR: 8227
  Reviewed by:	Sander Striker (concept), Aaron Bannert (concept)
  
  Revision  Changes    Path
  1.725     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.724
  retrieving revision 1.725
  diff -u -r1.724 -r1.725
  --- CHANGES	23 Apr 2002 22:15:09 -0000	1.724
  +++ CHANGES	23 Apr 2002 22:42:03 -0000	1.725
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.36
   
  +  *) Fix generation of default httpd.conf when the layout paths are
  +     disjoint.  PR 8227.  [Justin Erenkrantz]
  +
     *) Swap downgrade-1.0 and force-response-1.0 conditional checks so
        that downgraded responses can have force-response.  PR 8357.
        [Justin Erenkrantz]
  
  
  
  1.3       +13 -13    httpd-2.0/docs/conf/httpd-std.conf.in
  
  Index: httpd-std.conf.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- httpd-std.conf.in	12 Apr 2002 01:08:40 -0000	1.2
  +++ httpd-std.conf.in	23 Apr 2002 22:42:03 -0000	1.3
  @@ -290,7 +290,7 @@
   # documents. By default, all requests are taken from this directory, but
   # symbolic links and aliases may be used to point to other locations.
   #
  -DocumentRoot "@@ServerRoot@@/@rel_htdocsdir@"
  +DocumentRoot "@exp_htdocsdir@"
   
   #
   # Each directory to which Apache has access can be configured with respect
  @@ -315,7 +315,7 @@
   #
   # This should be changed to whatever you set DocumentRoot to.
   #
  -<Directory "@@ServerRoot@@/@rel_htdocsdir@">
  +<Directory "@exp_htdocsdir@">
   
   #
   # Possible values for the Options directive are "None", "All",
  @@ -499,9 +499,9 @@
   # We include the /icons/ alias for FancyIndexed directory listings.  If you
   # do not use FancyIndexing, you may comment this out.
   #
  -Alias /icons/ "@@ServerRoot@@/@rel_iconsdir@/"
  +Alias /icons/ "@exp_iconsdir@/"
   
  -<Directory "@@ServerRoot@@/@rel_iconsdir@">
  +<Directory "@exp_iconsdir@">
       Options Indexes MultiViews
       AllowOverride None
       Order allow,deny
  @@ -513,9 +513,9 @@
   # the manual, even if you choose to move your DocumentRoot.  You may comment
   # this out if you do not care for the documentation.
   #
  -Alias /manual "@@ServerRoot@@/@rel_manualdir@"
  +Alias /manual "@exp_manualdir@"
   
  -<Directory "@@ServerRoot@@/@rel_manualdir@">
  +<Directory "@exp_manualdir@">
       Options Indexes FollowSymLinks MultiViews
       AllowOverride None
       Order allow,deny
  @@ -530,7 +530,7 @@
   # The same rules about trailing "/" apply to ScriptAlias directives as to
   # Alias.
   #
  -ScriptAlias /cgi-bin/ "@@ServerRoot@@/@rel_cgidir@/"
  +ScriptAlias /cgi-bin/ "@exp_cgidir@/"
   
   <IfModule mod_cgid.c>
   #
  @@ -541,10 +541,10 @@
   </IfModule>
   
   #
  -# "@@ServerRoot@@/@rel_cgidir@" should be changed to whatever your ScriptAliased
  +# "@exp_cgidir@" should be changed to whatever your ScriptAliased
   # CGI directory exists, if you have that configured.
   #
  -<Directory "@@ServerRoot@@/@rel_cgidir@">
  +<Directory "@exp_cgidir@">
       AllowOverride None
       Options None
       Order allow,deny
  @@ -854,15 +854,15 @@
   #   Alias /error/include/ "/your/include/path/"
   #
   # which allows you to create your own set of files by starting with the
  -# @@ServerRoot@@/@rel_errordir@/include/ files and
  +# @exp_errordir@/include/ files and
   # copying them to /your/include/path/, even on a per-VirtualHost basis.
   #
   
   <IfModule mod_negotiation.c>
   <IfModule mod_include.c>
  -    Alias /error/ "@@ServerRoot@@/@rel_errordir@/"
  +    Alias /error/ "@exp_errordir@/"
   
  -    <Directory "@@ServerRoot@@/@rel_errordir@">
  +    <Directory "@exp_errordir@">
           AllowOverride None
           Options IncludesNoExec
           AddOutputFilter Includes html
  @@ -960,7 +960,7 @@
   # To enable the cache as well, edit and uncomment the following lines:
   # (no cacheing without CacheRoot)
   #
  -#CacheRoot "@@ServerRoot@@/@rel_proxycachedir@"
  +#CacheRoot "@exp_proxycachedir@"
   #CacheSize 5
   #CacheGcInterval 4
   #CacheMaxExpire 24