cvs commit: apache-1.3/conf httpd.conf-dist
rse 00/02/20 23:30:46 Modified:conf httpd.conf-dist Log: Clarify that MultiViews is required for the automatic extension checks. Submitted by: Ian Kallen [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall Revision ChangesPath 1.55 +4 -3 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.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- httpd.conf-dist 2000/01/30 16:18:34 1.54 +++ httpd.conf-dist 2000/02/21 07:30:46 1.55 @@ -615,9 +615,10 @@ # HeaderName is the name of a file which should be prepended to # directory indexes. # -# The server will first look for name.html and include it if found. -# If name.html doesn't exist, the server will then look for name.txt -# and include it as plaintext if found. +# If MultiViews are amongst the Options in effect, the server will +# first look for name.html and include it if found. If name.html +# doesn't exist, the server will then look for name.txt and include +# it as plaintext if found. # ReadmeName README HeaderName HEADER
cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-win
martin 99/12/09 08:01:10 Modified:conf httpd.conf-dist httpd.conf-dist-win Log: Language definition to go with czech homepage Revision ChangesPath 1.51 +2 -1 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- httpd.conf-dist 1999/11/18 10:08:26 1.50 +++ httpd.conf-dist 1999/12/09 16:01:09 1.51 @@ -646,7 +646,7 @@ # Danish (da) - Dutch (nl) - English (en) - Estonian (ee) # French (fr) - German (de) - Greek-Modern (el) # Italian (it) -Portugese (pt) - Luxembourgeois* (ltz) -# Spanish (es) - Swedish (sv) - Catalan (ca) +# Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz) # AddLanguage da .dk AddLanguage nl .nl @@ -661,6 +661,7 @@ AddLanguage ca .ca AddLanguage es .es AddLanguage sv .se +AddLanguage cz .cz # LanguagePriority allows you to give precedence to some languages # in case of a tie during content negotiation. 1.30 +2 -1 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.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- httpd.conf-dist-win 1999/09/21 20:27:15 1.29 +++ httpd.conf-dist-win 1999/12/09 16:01:09 1.30 @@ -583,7 +583,7 @@ # Danish (da) - Dutch (nl) - English (en) - Estonian (ee) # French (fr) - German (de) - Greek-Modern (el) # Italian (it) -Portugese (pt) - Luxembourgeois* (ltz) -# Spanish (es) - Swedish (sv) - Catalan (ca) +# Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz) # AddLanguage da .dk AddLanguage nl .nl @@ -598,6 +598,7 @@ AddLanguage ca .ca AddLanguage es .es AddLanguage sv .se +AddLanguage cz .cz # LanguagePriority allows you to give precedence to some languages # in case of a tie during content negotiation.
cvs commit: apache-1.3/conf httpd.conf-dist
martin 99/11/18 02:08:34 Modified:conf httpd.conf-dist Log: Fix typo Revision ChangesPath 1.50 +1 -1 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- httpd.conf-dist 1999/09/21 20:27:11 1.49 +++ httpd.conf-dist 1999/11/18 10:08:26 1.50 @@ -341,7 +341,7 @@ #Order allow,deny #Allow from all #/Limit -#LimitExcept GET POST OPTIONS PROFIND +#LimitExcept GET POST OPTIONS PROPFIND #Order deny,allow #Deny from all #/LimitExcept
cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-win
martin 99/08/30 04:43:59 Modified:conf httpd.conf-dist httpd.conf-dist-win Added: htdocs index.html.es-ct Log: Catalan version of the Entry Page, contributed by two colleagues of the Siemens Apache Project, Jean-Frédéric Clère and Ignasi Roca. Submitted by: Jean-Frédéric Clère [EMAIL PROTECTED]; Ignasi Roca [EMAIL PROTECTED] Revision ChangesPath 1.1 apache-1.3/htdocs/index.html.es-ct Index: index.html.es-ct === !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 3.2 Final//EN HTML HEAD TITLEPagrave;gina de prova de l'instalmiddot;lacioacute; d'Apache/TITLE /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 ALINK=#FF H1 ALIGN=CENTER Funcionanbsp;! El servidor web Apache estagrave; instalmiddot;lat en aquest lloc nbsp;! /H1 P Si veu aquesta pagrave;gina, es que els propietaris d'aquest domini acaben d'instalmiddot;lar satisfactograve;riament el A HREF=http://www.apache.org/httpd;servidor web Apache/A. Ara han d'afegir contingut en aquest directori i substituir aquesta pagrave;gina, o begrave; dirigir aquest servidor cap al contingut real. /P HR BLOCKQUOTE Si estagrave; veien aquesta pagrave;gina i no es la que esperava, posis en contacte amb STRONGl'administrador web d'aquest lloc./STRONG (Provi d'enviar un correu electrograve;nic a SAMPlt;Webmaster@EMdomain/EMgt;/SAMP.) Encara que aquest lloc estagrave; utilitzant el programari Apache, es gairebeacute; segur que no tegrave; res a veure amb el Grup Apache, per tant no enviiuml; cap correu electrograve;nic als autors d'Apache referent a aquest lloc o al seu contingut. Si es que ho fa, el seu missatge seragrave; STRONGBIGignorat/BIG/STRONG. /BLOCKQUOTE HR P La A HREF=manual/index.htmldocumentacioacute;/A d'Apache ha estat inclosa en aquesta distribucioacute;. /P P L'administrador de web pot utilitzar lliurement la imatge d'aquiacute; sota en el servidor web equipat amb el programari Apache. Gragrave;cies per utilitzar Apachenbsp;! /P DIV ALIGN=CENTER IMG SRC=apache_pb.gif ALT= /DIV /BODY /HTML 1.48 +4 -3 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- httpd.conf-dist 1999/08/29 03:01:26 1.47 +++ httpd.conf-dist 1999/08/30 11:43:58 1.48 @@ -646,7 +646,7 @@ # Danish (da) - Dutch (nl) - English (en) - Estonian (ee) # French (fr) - German (de) - Greek-Modern (el) # Italian (it) -Portugese (pt) - Luxembourgeois* (ltz) -# Spanish (es) - Swedish (sv) +# Spanish (es) - Swedish (sv) - Catalan (es-ct) # AddLanguage da .dk AddLanguage nl .nl @@ -658,6 +658,7 @@ AddLanguage it .it AddLanguage pt .pt AddLanguage ltz .lu +AddLanguage es-ct .es-ct AddLanguage es .es AddLanguage sv .se @@ -665,9 +666,9 @@ # in case of a tie during content negotiation. # # Just list the languages in decreasing order of preference. We have -# more or less alphabetized them here. You propably want to change this. +# more or less alphabetized them here. You probably want to change this. # -LanguagePriority en da nl et fr de el it pt ltz es sv +LanguagePriority en da nl et fr de el it pt ltz es-ct es sv # # AddType allows you to tweak mime.types without actually editing it, or to 1.28 +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.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- httpd.conf-dist-win 1999/08/28 10:33:16 1.27 +++ httpd.conf-dist-win 1999/08/30 11:43:58 1.28 @@ -583,7 +583,7 @@ # Danish (da) - Dutch (nl) - English (en) - Estonian (ee) # French (fr) - German (de) - Greek-Modern (el) # Italian (it) -Portugese (pt) - Luxembourgeois* (ltz) -# Spanish (es) - Swedish (sv) +# Spanish (es) - Swedish (sv) - Catalan (es-ct) # AddLanguage da .dk AddLanguage nl .nl @@ -595,6 +595,7 @@ AddLanguage it .it AddLanguage pt .pt AddLanguage ltz .lu +AddLanguage es-ct .es-ct AddLanguage es .es AddLanguage sv .se @@ -602,9 +603,9 @@ # in case of a tie during content negotiation. # # Just list the languages in decreasing order of preference. We have -# more or less alphabetized them here. You propably want to change this. +# more or less
cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-win
dirkx 99/08/27 08:04:20 Modified:conf httpd.conf-dist httpd.conf-dist-win Log: Just making sure that all the language's we currently have the welcome page as, are all available. Revision ChangesPath 1.43 +21 -10apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /x3/home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- httpd.conf-dist 1999/05/05 20:17:59 1.42 +++ httpd.conf-dist 1999/08/27 15:04:15 1.43 @@ -308,7 +308,7 @@ # Note that MultiViews must be named *explicitly* --- Options All # doesn't give it to you. # -Options Indexes FollowSymLinks +Options Indexes FollowSymLinks MultiViews # # This controls which options the .htaccess files in directories can @@ -632,19 +632,30 @@ # net-standard language code is pl) may wish to use AddLanguage pl .po # to avoid the ambiguity with the common suffix for perl scripts. # -AddLanguage en .en -AddLanguage fr .fr -AddLanguage de .de -AddLanguage da .da -AddLanguage el .el -AddLanguage it .it +# In the case of 'ltz' we violate the RFC by using a three char +# specifier. But there is 'work in progress' to fix this and get +# the reference data for rfc1766 cleaned up. +# +AddLanguage da .dk # Danish +AddLanguage nl .nl # Dutch +AddLanguage en .en # English +AddLanguage et .ee # Estonian +AddLanguage fr .fr # Frech +AddLanguage de .de # German +AddLanguage el .el # Greek (Modern) +AddLanguage it .it # Italian +AddLanguage pt .pl # Portugese +AddLanguage ltz .lu # Luxembourgeois* +AddLanguage es .es # Spanish +AddLanguage sv .se # Swedish -# # LanguagePriority allows you to give precedence to some languages # in case of a tie during content negotiation. -# Just list the languages in decreasing order of preference. +# +# Just list the languages in decreasing order of preference. We have +# more or less alphabetized them here. You propably want to change this. # -LanguagePriority en fr de +LanguagePriority en da nl et fr de el it pt x-lux es sv # # AddType allows you to tweak mime.types without actually editing it, or to 1.24 +20 -9 apache-1.3/conf/httpd.conf-dist-win Index: httpd.conf-dist-win === RCS file: /x3/home/cvs/apache-1.3/conf/httpd.conf-dist-win,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- httpd.conf-dist-win 1999/05/05 20:18:00 1.23 +++ httpd.conf-dist-win 1999/08/27 15:04:16 1.24 @@ -569,19 +569,30 @@ # net-standard language code is pl) may wish to use AddLanguage pl .po # to avoid the ambiguity with the common suffix for perl scripts. # -AddLanguage en .en -AddLanguage fr .fr -AddLanguage de .de -AddLanguage da .da -AddLanguage el .el -AddLanguage it .it - +# In the case of 'ltz' we violate the RFC by using a three char +# specifier. But there is 'work in progress' to fix this and get +# the reference data for rfc1766 cleaned up. # +AddLanguage da .dk # Danish +AddLanguage nl .nl # Dutch +AddLanguage en .en # English +AddLanguage et .ee # Estonian +AddLanguage fr .fr # Frech +AddLanguage de .de # German +AddLanguage el .el # Greek (Modern) +AddLanguage it .it # Italian +AddLanguage pt .pl # Portugese +AddLanguage ltz .lu # Luxembourgeois* +AddLanguage es .es # Spanish +AddLanguage sv .se # Swedish + # LanguagePriority allows you to give precedence to some languages # in case of a tie during content negotiation. -# Just list the languages in decreasing order of preference. +# +# Just list the languages in decreasing order of preference. We have +# more or less alphabetized them here. You propably want to change this. # -LanguagePriority en fr de +LanguagePriority en da nl et fr de el it pt x-lux es sv # # AddType allows you to tweak mime.types without actually editing it, or to
cvs commit: apache-1.3/conf httpd.conf-dist-win
dirkx 99/08/27 08:05:43 Modified:conf httpd.conf-dist-win Log: Make sure we see the multi lang stuff. Revision ChangesPath 1.25 +1 -1 apache-1.3/conf/httpd.conf-dist-win Index: httpd.conf-dist-win === RCS file: /x3/home/cvs/apache-1.3/conf/httpd.conf-dist-win,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- httpd.conf-dist-win 1999/08/27 15:04:16 1.24 +++ httpd.conf-dist-win 1999/08/27 15:05:40 1.25 @@ -270,7 +270,7 @@ # Note that MultiViews must be named *explicitly* --- Options All # doesn't give it to you. # -Options Indexes FollowSymLinks +Options Indexes FollowSymLinks MultiViews # # This controls which options the .htaccess files in directories can
cvs commit: apache-1.3/conf httpd.conf-dist
dgaudet 99/04/20 10:59:38 Modified:conf httpd.conf-dist Log: * matches a single component, this example makes more sense PR: 4221 Revision ChangesPath 1.39 +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.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- httpd.conf-dist 1999/03/10 09:14:27 1.38 +++ httpd.conf-dist 1999/04/20 17:59:35 1.39 @@ -328,7 +328,7 @@ # Control access to UserDir directories. The following is an example # for a site where these directories are restricted to read-only. # -#Directory /*/public_html +#Directory /home/*/public_html #AllowOverride FileInfo AuthConfig Limit #Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec #Limit GET POST OPTIONS PROPFIND
cvs commit: apache-1.3/conf httpd.conf-dist
dgaudet 99/04/20 11:03:12 Modified:conf httpd.conf-dist Log: protect .ht* files ... rather than just .htaccess (it costs pretty much the same) PR: 4215 Revision ChangesPath 1.40 +4 -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.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- httpd.conf-dist 1999/04/20 17:59:35 1.39 +++ httpd.conf-dist 1999/04/20 18:03:09 1.40 @@ -361,7 +361,10 @@ # .htaccess files. If you change the AccessFileName directive above, # be sure to make the corresponding changes here. # -Files .htaccess +# Also, folks tend to use names such as .htpasswd for password +# files, so this will protect those as well. +# +Files ~ ^\.ht Order allow,deny Deny from all /Files
cvs commit: apache-1.3/conf httpd.conf-dist
rse 99/03/10 01:14:27 Modified:conf httpd.conf-dist Log: Because with the TARGET feature the name can be different, avoid explicit self-references inside httpd.conf which confused people in the past. Revision ChangesPath 1.38 +2 -3 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.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- httpd.conf-dist 1999/02/07 06:25:23 1.37 +++ httpd.conf-dist 1999/03/10 09:14:27 1.38 @@ -86,7 +86,7 @@ ScoreBoardFile logs/apache_runtime_status # -# In the standard configuration, the server will process httpd.conf, +# 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 @@ -132,8 +132,7 @@ # It does this by periodically checking how many servers are waiting # for a request. If there are fewer than MinSpareServers, it creates # a new spare. If there are more than MaxSpareServers, some of the -# spares die off. The default values in httpd.conf-dist are probably OK -# for most sites. +# spares die off. The default values are probably OK for most sites. # MinSpareServers 5 MaxSpareServers 10
cvs commit: apache-1.3/conf httpd.conf-dist-win
rse 99/03/10 05:02:13 Modified:src CHANGES conf httpd.conf-dist-win Log: Move the directive `ExtendedStatus' in httpd.conf-dist-win _after_ the DSO/DLL section because it's a directive from mod_status and isn't available before the DLL of mod_status is loaded. Submitted by: Martin POESCHL [EMAIL PROTECTED] Reviewed by: Ralf S. Engelschall PR: 3936 Revision ChangesPath 1.1275+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1274 retrieving revision 1.1275 diff -u -r1.1274 -r1.1275 --- CHANGES 1999/03/10 12:11:55 1.1274 +++ CHANGES 1999/03/10 13:02:10 1.1275 @@ -1,5 +1,10 @@ Changes with Apache 1.3.5 + *) Move the directive `ExtendedStatus' in httpd.conf-dist-win _after_ the + DSO/DLL section because it's a directive from mod_status and isn't + available before the DLL of mod_status is loaded. + [Martin POESCHL [EMAIL PROTECTED]] PR#3936 + *) Fix a bug in the calculation of the buffer size for the line continuation facility in Apache's configuration files which could lead to a buffer overflow situation. [Thomas Devanneaux [EMAIL PROTECTED]] PR#3617 1.22 +7 -7 apache-1.3/conf/httpd.conf-dist-win Index: httpd.conf-dist-win === RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist-win,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- httpd.conf-dist-win 1998/12/12 17:04:29 1.21 +++ httpd.conf-dist-win 1999/03/10 13:02:12 1.22 @@ -89,13 +89,6 @@ #AccessConfig conf/access.conf # -# ExtendedStatus controls whether Apache will generate full status -# information (ExtendedStatus On) or just basic information (ExtendedStatus -# Off) when the server-status handler is called. The default is Off. -# -#ExtendedStatus On - -# # Timeout: The number of seconds before receives and sends time out. # Timeout 300 @@ -185,6 +178,13 @@ #LoadModule speling_module modules/ApacheModuleSpeling.dll #LoadModule status_module modules/ApacheModuleStatus.dll #LoadModule usertrack_module modules/ApacheModuleUserTrack.dll + +# +# ExtendedStatus controls whether Apache will generate full status +# information (ExtendedStatus On) or just basic information (ExtendedStatus +# Off) when the server-status handler is called. The default is Off. +# +#ExtendedStatus On ### Section 2: 'Main' server configuration #
cvs commit: apache-1.3/conf httpd.conf-dist
rasmus 99/02/06 22:25:24 Modified:conf httpd.conf-dist Log: Suggest .php3 extension to match PHP docs Revision ChangesPath 1.37 +3 -3 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.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- httpd.conf-dist 1998/12/12 17:04:29 1.36 +++ httpd.conf-dist 1999/02/07 06:25:23 1.37 @@ -642,10 +642,10 @@ # AddType allows you to tweak mime.types without actually editing it, or to # make certain files to be certain types. # -# For example, the PHP3 module (not part of the Apache distribution) -# will typically use: +# For example, the PHP3 module (not part of the Apache distribution - see +# http://www.php.net) will typically use: # -#AddType application/x-httpd-php3 .phtml +#AddType application/x-httpd-php3 .php3 #AddType application/x-httpd-php3-source .phps #
cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-win
lars98/12/12 09:04:30 Modified:conf httpd.conf-dist httpd.conf-dist-win Log: Generalize virtual host comments. Added info about NameVirtualHost directive and '-S' option. Revision ChangesPath 1.36 +16 -9 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- httpd.conf-dist 1998/11/10 03:27:58 1.35 +++ httpd.conf-dist 1998/12/12 17:04:29 1.36 @@ -814,23 +814,30 @@ ### Section 3: Virtual Hosts # +# VirtualHost: If you want to maintain multiple domains/hostnames on your +# machine you can setup VirtualHost containers for them. +# Please see the documentation at URL:http://www.apache.org/docs/vhosts/ +# for further details before you try to setup virtual hosts. +# You may use the command line option '-S' to verify your virtual host +# configuration. # -# VirtualHost: Allows the daemon to respond to requests for more than one -# server address, if your server machine is configured to accept IP packets -# for multiple addresses. This can be accomplished with the ifconfig -# alias flag, or through kernel patches like VIF. +# If you want to use name-based virtual hosts you need to define at +# least one IP address (and port number) for them. # -# Almost any Apache directive may go into a VirtualHost# container. -# See the documentation at URL:http://www.apache.org/docs/vhosts.html, and -# also the BindAddress entry. +#NameVirtualHost 12.34.56.78:80 +#NameVirtualHost 12.34.56.78 + +# +# VirtualHost example: +# Almost any Apache directive may go into a VirtualHost container. # -#VirtualHost host.some_domain.com +#VirtualHost ip.address.of.host.some_domain.com #ServerAdmin [EMAIL PROTECTED] #DocumentRoot /www/docs/host.some_domain.com #ServerName host.some_domain.com #ErrorLog logs/host.some_domain.com-error_log -#TransferLog logs/host.some_domain.com-access_log +#CustomLog logs/host.some_domain.com-access_log common #/VirtualHost #VirtualHost _default_:* 1.21 +17 -10apache-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.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- httpd.conf-dist-win 1998/10/22 20:56:52 1.20 +++ httpd.conf-dist-win 1998/12/12 17:04:29 1.21 @@ -749,23 +749,30 @@ ### Section 3: Virtual Hosts # +# VirtualHost: If you want to maintain multiple domains/hostnames on your +# machine you can setup VirtualHost containers for them. +# Please see the documentation at URL:http://www.apache.org/docs/vhosts/ +# for further details before you try to setup virtual hosts. +# You may use the command line option '-S' to verify your virtual host +# configuration. # -# VirtualHost: Allows the daemon to respond to requests for more than one -# server address, if your server machine is configured to accept IP packets -# for multiple addresses. This can be accomplished with the ifconfig -# alias flag, or through kernel patches like VIF. +# If you want to use name-based virtual hosts you need to define at +# least one IP address (and port number) for them. # -# Almost any Apache directive may go into a VirtualHost# container. -# See the documentation at URL:http://www.apache.org/docs/vhosts.html, and -# also the BindAddress entry. +#NameVirtualHost 12.34.56.78:80 +#NameVirtualHost 12.34.56.78 + +# +# VirtualHost example: +# Almost any Apache directive may go into a VirtualHost container. # -#VirtualHost host.some_domain.com +#VirtualHost ip.address.of.host.some_domain.com #ServerAdmin [EMAIL PROTECTED] #DocumentRoot /www/docs/host.some_domain.com #ServerName host.some_domain.com -#ErrorLog logs/host.some_domain.com-error.log -#TransferLog logs/host.some_domain.com-access.log +#ErrorLog logs/host.some_domain.com-error_log +#CustomLog logs/host.some_domain.com-access_log common #/VirtualHost #VirtualHost _default_:*
cvs commit: apache-1.3/conf httpd.conf-dist
fielding98/11/09 19:27:59 Modified:conf httpd.conf-dist Log: Restore IndexOptions FancyIndexing, since it is the latter directive that is now deprecated. Revision ChangesPath 1.35 +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.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- httpd.conf-dist 1998/11/08 10:43:38 1.34 +++ httpd.conf-dist 1998/11/10 03:27:58 1.35 @@ -535,7 +535,7 @@ # # FancyIndexing is whether you want fancy directory indexing or standard # -FancyIndexing On +IndexOptions FancyIndexing # # AddIcon* directives tell the server which icon to show for different
cvs commit: apache-1.3/conf httpd.conf-dist
fielding98/11/08 02:43:39 Modified:conf httpd.conf-dist Log: Add Directory section for /icons/ because it is necessary if the site changes the / (root) section to deny access by default. Add examples for setting UserDir and proxy access (currently unlimited). Restore FancyIndexing directive instead of IndexOptions FancyIndexing. Fix some comments and typos. Revision ChangesPath 1.34 +43 -7 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.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- httpd.conf-dist 1998/10/28 22:04:09 1.33 +++ httpd.conf-dist 1998/11/08 10:43:38 1.34 @@ -111,7 +111,7 @@ # # MaxKeepAliveRequests: The maximum number of requests to allow # during a persistent connection. Set to 0 to allow an unlimited amount. -# We reccomend you leave this number high, for maximum performance. +# We recommend you leave this number high, for maximum performance. # MaxKeepAliveRequests 100 @@ -326,6 +326,23 @@ UserDir public_html # +# Control access to UserDir directories. The following is an example +# for a site where these directories are restricted to read-only. +# +#Directory /*/public_html +#AllowOverride FileInfo AuthConfig Limit +#Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec +#Limit GET POST OPTIONS PROPFIND +#Order allow,deny +#Allow from all +#/Limit +#Limit PUT DELETE PATCH PROPPATCH MKCOL COPY MOVE LOCK UNLOCK +#Order deny,allow +#Deny from all +#/Limit +#/Directory + +# # DirectoryIndex: Name of the file or files to use as a pre-written HTML # directory index. Separate multiple entries with spaces. # @@ -476,6 +493,13 @@ # Alias /icons/ @@ServerRoot@@/icons/ +Directory @@ServerRoot@@/icons +Options Indexes MultiViews +AllowOverride None +Order allow,deny +Allow from all +/Directory + # # ScriptAlias: This controls which directories contain server scripts. # ScriptAliases are essentially the same as Aliases, except that @@ -493,6 +517,8 @@ Directory @@ServerRoot@@/cgi-bin AllowOverride None Options None +Order allow,deny +Allow from all /Directory # @@ -509,7 +535,7 @@ # # FancyIndexing is whether you want fancy directory indexing or standard # -IndexOptions FancyIndexing +FancyIndexing On # # AddIcon* directives tell the server which icon to show for different @@ -585,7 +611,7 @@ # AddEncoding allows you to have certain browsers (Mosaic/X 2.1+) uncompress # information on the fly. Note: Not all browsers support this. # Despite the name similarity, the following Add* directives have nothing -# to do with the FancyIndexing customisation directives above. +# to do with the FancyIndexing customization directives above. # AddEncoding x-compress Z AddEncoding x-gzip gz @@ -697,9 +723,9 @@ # request will *not* be available to such a script. # -# The following directives disable keepalives and HTTP header flushes. -# The first directive disables it for Netscape 2.x and browsers which -# spoof it. There are known problems with these. +# The following directives modify normal HTTP response behavior. +# The first directive disables keepalive for Netscape 2.x and browsers that +# spoof it. There are known problems with these browser implementations. # The second directive is for Microsoft Internet Explorer 4.0b2 # which has a broken HTTP/1.1 implementation and does not properly # support keepalive when it is used on 301 or 302 (redirect) responses. @@ -752,10 +778,17 @@ #/Location # -# Proxy Server directives. Uncomment the following line to +# Proxy Server directives. Uncomment the following lines to # enable the proxy server: # +#IfModule mod_proxy.c #ProxyRequests On +# +#Directory proxy:* +#Order deny,allow +#Deny from all +#Allow from .your_domain.com +#/Directory # # Enable/disable the handling of HTTP/1.1 Via: headers. @@ -775,6 +808,9 @@ #CacheLastModifiedFactor 0.1 #CacheDefaultExpire 1 #NoCache a_domain.com another_domain.edu joes.garage_sale.com + +#/IfModule +# End of proxy directives. ### Section 3: Virtual Hosts #
cvs commit: apache-1.3/conf httpd.conf-dist
manoj 98/10/28 14:04:10 Modified:conf httpd.conf-dist Log: ExtendedStatus cannot be enabled until the status module is loaded, so move the commented directive after DSO modules are loaded. Revision ChangesPath 1.33 +7 -7 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.32 retrieving revision 1.33 diff -u -u -r1.32 -r1.33 --- httpd.conf-dist 1998/10/22 20:56:51 1.32 +++ httpd.conf-dist 1998/10/28 22:04:09 1.33 @@ -98,13 +98,6 @@ #AccessConfig conf/access.conf # -# ExtendedStatus controls whether Apache will generate full status -# information (ExtendedStatus On) or just basic information (ExtendedStatus -# Off) when the server-status handler is called. The default is Off. -# -#ExtendedStatus On - -# # Timeout: The number of seconds before receives and sends time out. # Timeout 300 @@ -202,6 +195,13 @@ # # Example: # LoadModule foo_module libexec/mod_foo.so + +# +# ExtendedStatus controls whether Apache will generate full status +# information (ExtendedStatus On) or just basic information (ExtendedStatus +# Off) when the server-status handler is called. The default is Off. +# +#ExtendedStatus On ### Section 2: 'Main' server configuration #
cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-win
martin 98/09/04 10:10:40 Modified:conf httpd.conf-dist httpd.conf-dist-win Log: Proxy is not installed by default: don't configure ProxyVia Revision ChangesPath 1.29 +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.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- httpd.conf-dist 1998/09/03 18:04:08 1.28 +++ httpd.conf-dist 1998/09/04 17:10:39 1.29 @@ -224,7 +224,7 @@ # Enable/disable the handling of HTTP/1.1 Via: headers. # (Full adds the server version; Block removes all outgoing Via: headers) # Set to one of: Off | On | Full | Block -ProxyVia on +#ProxyVia on # To enable the cache as well, edit and uncomment the following lines: # (no cacheing without CacheRoot) 1.18 +1 -1 apache-1.3/conf/httpd.conf-dist-win Index: httpd.conf-dist-win === RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist-win,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- httpd.conf-dist-win 1998/09/03 18:04:08 1.17 +++ httpd.conf-dist-win 1998/09/04 17:10:39 1.18 @@ -190,7 +190,7 @@ # Enable/disable the handling of HTTP/1.1 Via: headers. # (Full adds the server version; Block removes all outgoing Via: headers) # Set to one of: Off | On | Full | Block -ProxyVia on +#ProxyVia on # To enable the cache as well, edit and uncomment the following lines: # (no cacheing without CacheRoot)
cvs commit: apache-1.3/conf httpd.conf-dist-win
brian 98/05/21 11:50:59 Modified:conf httpd.conf-dist-win Log: Reviewed by: Paul Sutton, Martin Kraemer Move the _log to .log. Revision ChangesPath 1.13 +8 -8 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.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- httpd.conf-dist-win 1998/03/29 19:11:57 1.12 +++ httpd.conf-dist-win 1998/05/21 18:50:58 1.13 @@ -71,9 +71,9 @@ # ErrorLog: The location of the error log file. If this does not start # with /, ServerRoot is prepended to it. -ErrorLog logs/error_log +ErrorLog logs/error.log -# LogLevel: Control the number of messages logged to the error_log. +# LogLevel: Control the number of messages logged to the error.log. # Possible values include: debug, info, notice, warn, error, crit, # alert, emerg. @@ -90,18 +90,18 @@ # The location of the access logfile (Common Logfile Format). # If this does not start with /, ServerRoot is prepended to it. -CustomLog logs/access_log common +CustomLog logs/access.log common # If you would like to have an agent and referer logfile uncomment the # following directives. -#CustomLog logs/referer_log referer -#CustomLog logs/agent_log agent +#CustomLog logs/referer.log referer +#CustomLog logs/agent.log agent # If you prefer a single logfile with access, agent and referer information # (Combined Logfile Format) you can use the following directive. -#CustomLog logs/access_log combined +#CustomLog logs/access.log combined # PidFile: The file the server should log its pid to PidFile logs/httpd.pid @@ -209,8 +209,8 @@ #ServerAdmin [EMAIL PROTECTED] #DocumentRoot /www/docs/host.some_domain.com #ServerName host.some_domain.com -#ErrorLog logs/host.some_domain.com-error_log -#TransferLog logs/host.some_domain.com-access_log +#ErrorLog logs/host.some_domain.com-error.log +#TransferLog logs/host.some_domain.com-access.log #/VirtualHost
cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-win
dgaudet 98/03/29 11:11:58
Modified:src CHANGES
conf httpd.conf-dist httpd.conf-dist-win
Log:
give CustlomLog examples rather than examples of the old directives
Submitted by: Lars Eilebrecht
Revision ChangesPath
1.748 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.747
retrieving revision 1.748
diff -u -r1.747 -r1.748
--- CHANGES 1998/03/29 12:27:31 1.747
+++ CHANGES 1998/03/29 19:11:54 1.748
@@ -1,5 +1,9 @@
Changes with Apache 1.3b6
+ *) Modify the log directives in httpd.conf-dist files to use CustomLog
+ so that users have examples of how CustomLog can be used.
+ [Lars Eilebrecht]
+
*) Add the new Apache Autoconf-style Interface (APACI) for the top-level of
the Apache distribution tree. Until Apache 1.3 there was no real
out-of-the-box batch-capable build and installation procedure for the
1.24 +22 -3 apache-1.3/conf/httpd.conf-dist
Index: httpd.conf-dist
===
RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- httpd.conf-dist 1998/03/27 11:00:22 1.23
+++ httpd.conf-dist 1998/03/29 19:11:57 1.24
@@ -74,10 +74,29 @@
LogLevel warn
-# TransferLog: The location of the transfer log file. If this does not
-# start with /, ServerRoot is prepended to it.
+# The following directives define some format nicknames for use with
+# a CustomLog directive (see below).
-TransferLog logs/access_log
+LogFormat %h %l %u %t \%r\ %s %b \%{Referer}i\ \%{User-Agent}i\
combined
+LogFormat %h %l %u %t \%r\ %s %b common
+LogFormat %{Referer}i - %U referer
+LogFormat %{User-agent}i agent
+
+# The location of the access logfile (Common Logfile Format).
+# If this does not start with /, ServerRoot is prepended to it.
+
+CustomLog logs/access_log common
+
+# If you would like to have an agent and referer logfile uncomment the
+# following directives.
+
+#CustomLog logs/referer_log referer
+#CustomLog logs/agent_log agent
+
+# If you prefer a single logfile with access, agent and referer information
+# (Combined Logfile Format) you can use the following directive.
+
+#CustomLog logs/access_log combined
# PidFile: The file the server should log its pid to
PidFile logs/httpd.pid
1.12 +22 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- httpd.conf-dist-win 1998/03/21 17:34:04 1.11
+++ httpd.conf-dist-win 1998/03/29 19:11:57 1.12
@@ -79,10 +79,29 @@
LogLevel warn
-# TransferLog: The location of the transfer log file. If this does not
-# start with /, ServerRoot is prepended to it.
+# The following directives define some format nicknames for use with
+# a CustomLog directive (see below).
-TransferLog logs/access_log
+LogFormat %h %l %u %t \%r\ %s %b \%{Referer}i\ \%{User-Agent}i\
combined
+LogFormat %h %l %u %t \%r\ %s %b common
+LogFormat %{Referer}i - %U referer
+LogFormat %{User-agent}i agent
+
+# The location of the access logfile (Common Logfile Format).
+# If this does not start with /, ServerRoot is prepended to it.
+
+CustomLog logs/access_log common
+
+# If you would like to have an agent and referer logfile uncomment the
+# following directives.
+
+#CustomLog logs/referer_log referer
+#CustomLog logs/agent_log agent
+
+# If you prefer a single logfile with access, agent and referer information
+# (Combined Logfile Format) you can use the following directive.
+
+#CustomLog logs/access_log combined
# PidFile: The file the server should log its pid to
PidFile logs/httpd.pid
cvs commit: apache-1.3/conf httpd.conf-dist
rse 98/03/27 03:00:22 Modified:conf httpd.conf-dist Log: Make sure the user finds the location where he has to put the LoadModule lines when using shared objects. Because these lines have to be in front of any directives which are contained in the module itself it is recommended to load those modules at the top of httpd.conf. Revision ChangesPath 1.23 +7 -0 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- httpd.conf-dist 1998/03/06 19:56:24 1.22 +++ httpd.conf-dist 1998/03/27 11:00:22 1.23 @@ -7,6 +7,13 @@ # Originally by Rob McCool +# Shared Object Module Loading: +# To be able to use the functionality of a module which was built +# as a shared object you have to place corresponding `LoadModule' +# lines at this location so the directives contained in it are +# actually available _before_ they are used. +#LoadModule config_log_module libexec/mod_log_config.so + # ServerType is either inetd, or standalone. ServerType standalone
cvs commit: apache-1.3/conf httpd.conf-dist-win
marc98/03/20 21:05:20 Modified:conf httpd.conf-dist-win Log: Be nice now; give people a list of read-made LoadModule lines to pick and choose from. Revision ChangesPath 1.10 +18 -0 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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- httpd.conf-dist-win 1998/03/06 19:56:24 1.9 +++ httpd.conf-dist-win 1998/03/21 05:05:19 1.10 @@ -16,6 +16,24 @@ ServerType standalone +# +# The following lists extra modules that can be uncommented to be loaded +# to enable extra functionality. See the manual +# (http://www.apache.org/docs/mod/) for details on the functionality +# of each module. +# +#LoadModule anon_auth_module modules/ApacheModuleAuthAnon.dll +#LoadModule cern_meta_module modules/ApacheModuleCERNMeta.dll +#LoadModule digest_module modules/ApacheModuleDigest.dll +#LoadModule expires_module modules/ApacheModuleExpires.dll +#LoadModule headers_module modules/ApacheModuleHeaders.dll +#LoadModule proxy_module modules/ApacheModuleProxy.dll +#LoadModule rewrite_module modules/ApacheModuleRewrite.dll +#LoadModule speling_module modules/ApacheModuleSpeling.dll +#LoadModule status_module modules/ApacheModuleStatus.dll +#LoadModule usertrack_module modules/ApacheModuleUserTrack.dll + + # Port: The port the standalone listens to. Port 80
cvs commit: apache-1.3/conf httpd.conf-dist-win
pcs 98/03/21 09:34:05 Modified:conf httpd.conf-dist-win Log: Remove StartServer setting which has no effect on Windows Revision ChangesPath 1.11 +5 -8 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.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- httpd.conf-dist-win 1998/03/21 05:05:19 1.10 +++ httpd.conf-dist-win 1998/03/21 17:34:04 1.11 @@ -137,20 +137,17 @@ KeepAliveTimeout 15 -# Server-pool size regulation. Apache excutes as multiple servers (this -# allows for some fault tolerance - if a server dies, another one takes -# its place), each of which are multithreaded and can serve multiple -# requests. - -# Start up 3 servers (in case one dies, another can take its place, while -# a new one is spawned -StartServers 3 +# Apache always creates one child process to handle requests. If it +# dies another child process is created automatically. Within the +# child process multiple threads handle incoming requests. The next two +# directives determine the behaviour of the threads and processes. # Don't force a server to exit after it has served some number of requests. # If you do want server's to exit after they have run for a long time (to # help the system clean up after the process), please set this to a pretty # large number - like 10,000. What this will do, is, each child server will # exit after serving 10,000 requests, and another server will take its place. + MaxRequestsPerChild 0 # Number of concurrent threads at a time (set the value to more or less
