cvs commit: apache-1.3/conf access.conf-dist highperformance.conf-dist httpd.conf-dist srm.conf-dist
fielding98/10/03 04:05:07 Modified:conf access.conf-dist highperformance.conf-dist httpd.conf-dist srm.conf-dist Log: Quote paths in default configuration files. Submitted by: Wilfredo Sanchez [EMAIL PROTECTED] Reviewed by:Roy Fielding, Ralf S. Engelschall Revision ChangesPath 1.16 +2 -2 apache-1.3/conf/access.conf-dist Index: access.conf-dist === RCS file: /home/cvs/apache-1.3/conf/access.conf-dist,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- access.conf-dist 1998/09/03 18:04:08 1.15 +++ access.conf-dist 1998/10/03 11:05:05 1.16 @@ -25,7 +25,7 @@ # This should be changed to whatever you set DocumentRoot to. -Directory @@ServerRoot@@/htdocs +Directory @@ServerRoot@@/htdocs # This may also be None, All, or any combination of Indexes, # Includes, FollowSymLinks, ExecCGI, or MultiViews. @@ -51,7 +51,7 @@ # @@ServerRoot@@/cgi-bin should be changed to whatever your ScriptAliased # CGI directory exists, if you have that configured. -Directory @@ServerRoot@@/cgi-bin +Directory @@ServerRoot@@/cgi-bin AllowOverride None Options None /Directory 1.2 +1 -1 apache-1.3/conf/highperformance.conf-dist Index: highperformance.conf-dist === RCS file: /home/cvs/apache-1.3/conf/highperformance.conf-dist,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- highperformance.conf-dist 1998/03/13 01:32:33 1.1 +++ highperformance.conf-dist 1998/10/03 11:05:05 1.2 @@ -43,7 +43,7 @@ /Directory # If this was a real internet server you'd probably want to uncomment this: -#Directory @@ServerRoot@@/htdocs +#Directory @@ServerRoot@@/htdocs #order allow,deny #allow from all #/Directory 1.31 +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.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- httpd.conf-dist 1998/09/12 20:16:50 1.30 +++ httpd.conf-dist 1998/10/03 11:05:05 1.31 @@ -63,7 +63,7 @@ # mounted filesystem then please read the LockFile documentation, # you will save yourself a lot of trouble. -ServerRoot @@ServerRoot@@ +ServerRoot @@ServerRoot@@ # BindAddress: You can support virtual hosts with this option. This option # is used to tell the server which IP address to listen to. It can either 1.27 +4 -4 apache-1.3/conf/srm.conf-dist Index: srm.conf-dist === RCS file: /home/cvs/apache-1.3/conf/srm.conf-dist,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- srm.conf-dist 1998/08/30 21:47:08 1.26 +++ srm.conf-dist 1998/10/03 11:05:06 1.27 @@ -12,12 +12,12 @@ # 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@@/htdocs +DocumentRoot @@ServerRoot@@/htdocs # UserDir: The name of the directory which is appended onto a user's home # directory if a ~user request is recieved. -UserDir public_html +UserDir @@UserDir@@ # DirectoryIndex: Name of the file or files to use as a pre-written HTML # directory index. Separate multiple entries with spaces. @@ -152,12 +152,12 @@ # require it to be present in the URL. So /icons isn't aliased in this # example. -Alias /icons/ @@ServerRoot@@/icons/ +Alias /icons/ @@ServerRoot@@/icons/ # ScriptAlias: This controls which directories contain server scripts. # Format: ScriptAlias fakename realname -#ScriptAlias /cgi-bin/ @@ServerRoot@@/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.
cvs commit: apache-1.3/conf access.conf-dist-win httpd.conf-dist-win
marc98/07/16 13:24:41 Modified:conf access.conf-dist-win httpd.conf-dist-win Log: A few minor win32 cleanups. More work is required to make the *-win files make sense. Revision ChangesPath 1.9 +5 -4 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- access.conf-dist-win 1998/06/08 14:37:26 1.8 +++ access.conf-dist-win 1998/07/16 20:24:40 1.9 @@ -18,10 +18,11 @@ # First, we configure the default to be a very restrictive set of # permissions. -Directory / -Options FollowSymLinks -AllowOverride None -/Directory +# disabled because it is currently broken on Win32 +#Directory / +#Options FollowSymLinks +#AllowOverride None +#/Directory # Note that from this point forward you must specifically allow # particular features to be enabled - so if something's not working as 1.16 +0 -5 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.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- httpd.conf-dist-win 1998/06/08 14:37:26 1.15 +++ httpd.conf-dist-win 1998/07/16 20:24:40 1.16 @@ -47,11 +47,6 @@ # If you wish httpd to run as a different user or group, you must run # httpd as root initially and it will switch. - -# User/Group: The name (or #number) of the user/group to run httpd as. -User nobody -Group #-1 - # ServerAdmin: Your address, where problems with the server should be # e-mailed.
cvs commit: apache-1.3/conf access.conf-dist
dgaudet 98/06/06 12:47:00 Modified:src CHANGES conf access.conf-dist Log: Change Options None to Options FollowSymLinks in the default Directory / section... given that we already default to symlinks elsewhere it doesn't make sense to disallow them here... and it's slower to disallow them. Related to PR 2363. Revision ChangesPath 1.891 +5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.890 retrieving revision 1.891 diff -u -r1.890 -r1.891 --- CHANGES 1998/06/06 19:30:38 1.890 +++ CHANGES 1998/06/06 19:46:58 1.891 @@ -1,5 +1,10 @@ Changes with Apache 1.3.1 + *) Change Options None to Options FollowSymLinks in the + Directory / section of the default access.conf-dist + (and -win even though it doesn't matter there). This has better + performance, and more intuitive semantics. [Dean Gaudet] + *) PORT: Updated support for UTS 2.1.2. [Dave Dykstra [EMAIL PROTECTED]] PR#2320 1.14 +1 -1 apache-1.3/conf/access.conf-dist Index: access.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/access.conf-dist,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- access.conf-dist 1998/05/29 01:27:49 1.13 +++ access.conf-dist 1998/06/06 19:46:59 1.14 @@ -14,7 +14,7 @@ # permissions. Directory / -Options None +Options FollowSymLinks AllowOverride None /Directory
cvs commit: apache-1.3/conf access.conf-dist-win
dgaudet 98/06/06 12:47:13 Modified:conf access.conf-dist-win Log: forgot this Revision ChangesPath 1.7 +1 -1 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- access.conf-dist-win 1998/05/30 14:46:49 1.6 +++ access.conf-dist-win 1998/06/06 19:47:13 1.7 @@ -19,7 +19,7 @@ # permissions. Directory / -Options None +Options FollowSymLinks AllowOverride None /Directory
cvs commit: apache-1.3/conf access.conf-dist-win httpd.conf-dist-win srm.conf-dist-win
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 ChangesPath 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.
cvs commit: apache-1.3/conf access.conf-dist access.conf-dist-win
brian 98/05/28 18:27:51 Modified:conf access.conf-dist access.conf-dist-win Log: Place a default configuration for the root dir which is very restrictive. Thanks to Dean for the hint. Revision ChangesPath 1.13 +14 -1 apache-1.3/conf/access.conf-dist Index: access.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/access.conf-dist,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- access.conf-dist 1997/08/19 23:00:22 1.12 +++ access.conf-dist 1998/05/29 01:27:49 1.13 @@ -10,6 +10,19 @@ # Originally by Rob McCool +# First, we configure the default to be a very restrictive set of +# permissions. + +Directory / +Options None +AllowOverride None +/Directory + +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. + # This should be changed to whatever you set DocumentRoot to. Directory @@ServerRoot@@/htdocs @@ -18,7 +31,7 @@ # Includes, FollowSymLinks, ExecCGI, or MultiViews. # Note that MultiViews must be named *explicitly* --- Options All -# doesn't give it to you (or at least, not yet). +# doesn't give it to you. Options Indexes FollowSymLinks 1.4 +13 -0 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- access.conf-dist-win 1997/10/25 19:10:09 1.3 +++ access.conf-dist-win 1998/05/29 01:27:50 1.4 @@ -15,6 +15,19 @@ # Originally by Rob McCool +# First, we configure the default to be a very restrictive set of +# permissions. + +Directory / +Options None +AllowOverride None +/Directory + +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. + # This should be changed to whatever you set DocumentRoot to. Directory @@ServerRoot@@/htdocs
cvs commit: apache-1.3/conf access.conf-dist-win
brian 98/05/28 18:31:32 Modified:conf access.conf-dist-win Log: Missed one. Revision ChangesPath 1.5 +1 -1 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- access.conf-dist-win 1998/05/29 01:27:50 1.4 +++ access.conf-dist-win 1998/05/29 01:31:32 1.5 @@ -36,7 +36,7 @@ # Includes, FollowSymLinks, ExecCGI, or MultiViews. # Note that MultiViews must be named *explicitly* --- Options All -# doesn't give it to you (or at least, not yet). +# doesn't give it to you. Options Indexes FollowSymLinks
