pcs 98/05/30 07:46:50
Modified: conf access.conf-dist-win httpd.conf-dist-win srm.conf-dist-win Log: Replace some absolute paths with @@ServerRoot@@ so they get expanded correctly at install time, like the Unix configuration files. Revision Changes Path 1.6 +2 -2 apache-1.3/conf/access.conf-dist-win Index: access.conf-dist-win =================================================================== RCS file: /export/home/cvs/apache-1.3/conf/access.conf-dist-win,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- access.conf-dist-win 1998/05/29 01:31:32 1.5 +++ access.conf-dist-win 1998/05/30 14:46:49 1.6 @@ -53,10 +53,10 @@ </Directory> -# /apache/cgi-bin should be changed to whatever your ScriptAliased +# @@ServerRoot@@/cgi-bin should be changed to whatever your ScriptAliased # CGI directory exists, if you have that configured. -<Directory /apache/cgi-bin> +<Directory @@ServerRoot@@/cgi-bin> AllowOverride None Options None </Directory> 1.14 +4 -3 apache-1.3/conf/httpd.conf-dist-win Index: httpd.conf-dist-win =================================================================== RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist-win,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- httpd.conf-dist-win 1998/05/21 18:50:58 1.13 +++ httpd.conf-dist-win 1998/05/30 14:46:49 1.14 @@ -5,13 +5,13 @@ # what they do, if you are unsure consult the online docs. You have been # warned. +# Originally by Rob McCool + # Note: Where filenames are specified, you must use forward slashes # instead of backslashes. e.g. "c:/apache" instead of "c:\apache". If # the drive letter is ommited, the drive where Apache.exe is located # will be assumed -# Originally by Rob McCool - # ServerType must be standalone. ServerType standalone @@ -42,6 +42,7 @@ # e.g. www.apache.org (on) or 204.62.129.132 (off) # The default is off because it'd be overall better for the net if people # had to knowingly turn this feature on. + HostnameLookups off # If you wish httpd to run as a different user or group, you must run @@ -183,7 +184,7 @@ # To enable the cache as well, edit and uncomment the following lines: -#CacheRoot /usr/local/apache/proxy +#CacheRoot @@ServerRoot@@/proxy #CacheSize 5 #CacheGcInterval 4 #CacheMaxExpire 24 1.11 +2 -2 apache-1.3/conf/srm.conf-dist-win Index: srm.conf-dist-win =================================================================== RCS file: /export/home/cvs/apache-1.3/conf/srm.conf-dist-win,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- srm.conf-dist-win 1998/05/21 18:01:59 1.10 +++ srm.conf-dist-win 1998/05/30 14:46:49 1.11 @@ -143,12 +143,12 @@ # require it to be present in the URL. So "/icons" isn't aliased in this # example. -Alias /icons/ /apache/icons/ +Alias /icons/ @@ServerRoot@@/icons/ # ScriptAlias: This controls which directories contain server scripts. # Format: ScriptAlias fakename realname -#ScriptAlias /cgi-bin/ /apache/cgi-bin/ +#ScriptAlias /cgi-bin/ @@ServerRoot@@/cgi-bin/ # If you want to use server side includes, or CGI outside # ScriptAliased directories, uncomment the following lines.