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 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 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 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 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
