diff options
author | cvsdist <cvsdist@fedoraproject.org> | 2004-09-09 06:22:22 +0000 |
---|---|---|
committer | cvsdist <cvsdist@fedoraproject.org> | 2004-09-09 06:22:22 +0000 |
commit | f8aafff896ca05fb94daa425a8fcfbd3eac282bf (patch) | |
tree | 019ee84ef97a71732d3e69e659ad0d9c51839653 | |
parent | 7acea2d4a8707ebeec7af2c87d222ea97968c59f (diff) | |
download | httpd-f8aafff896ca05fb94daa425a8fcfbd3eac282bf.tar.gz httpd-f8aafff896ca05fb94daa425a8fcfbd3eac282bf.tar.xz httpd-f8aafff896ca05fb94daa425a8fcfbd3eac282bf.zip |
auto-import changelog data from httpd-2.0.50-5.src.rpmhttpd-2_0_50-5
Wed Sep 01 2004 Joe Orton <jorton@redhat.com> 2.0.50-5
- move manual configuration into conf.d/manual.conf (#131208)
- add test_hook from HEAD, -t -DDUMP_CERTS for mod_ssl
- document AddDefaultCharset change since 1.3 in migration.html
-rw-r--r-- | httpd.conf | 32 | ||||
-rw-r--r-- | httpd.spec | 32 | ||||
-rw-r--r-- | index.html | 12 | ||||
-rw-r--r-- | manual.conf | 24 | ||||
-rw-r--r-- | migration.xml | 29 |
5 files changed, 82 insertions, 47 deletions
@@ -526,41 +526,13 @@ Alias /icons/ "/var/www/icons/" </Directory> # -# This should be changed to the ServerRoot/manual/. The alias provides -# the manual, even if you choose to move your DocumentRoot. You may comment -# this out if you do not care for the documentation. -# -AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/var/www/manual$1" - -<Directory "/var/www/manual"> - Options Indexes - AllowOverride None - Order allow,deny - Allow from all - - <Files *.html> - SetHandler type-map - </Files> - - SetEnvIf Request_URI ^/manual/de/ prefer-language=de - SetEnvIf Request_URI ^/manual/en/ prefer-language=en - SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr - SetEnvIf Request_URI ^/manual/ja/ prefer-language=ja - SetEnvIf Request_URI ^/manual/ko/ prefer-language=ko - SetEnvIf Request_URI ^/manual/ru/ prefer-language=ru - RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2 -</Directory> - +# WebDAV module configuration section. +# <IfModule mod_dav_fs.c> # Location of the WebDAV lock database. DAVLockDB /var/lib/dav/lockdb </IfModule> -<IfModule mod_dav.c> - # XML request bodies are loaded into memory; limit to 128K by default - LimitXMLRequestBody 131072 -</IfModule> - # # ScriptAlias: This controls which directories contain server scripts. # ScriptAliases are essentially the same as Aliases, except that @@ -1,13 +1,13 @@ %define contentdir /var/www %define suexec_caller apache %define mmn 20020903 -%define vstring Red Hat -%define distro Red Hat Enterprise Linux +%define vstring Fedora +%define distro Fedora Core Summary: Apache HTTP Server Name: httpd Version: 2.0.50 -Release: 4.ent +Release: 5 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -19,6 +19,7 @@ Source8: powered_by_rh.png Source10: httpd.conf Source11: ssl.conf Source12: welcome.conf +Source13: manual.conf Source14: mod_ssl-Makefile.crt Source15: mod_ssl-Makefile.crl # Documentation @@ -70,13 +71,15 @@ Patch85: httpd-2.0.48-sslvars2.patch Patch86: httpd-2.0.48-rewritessl.patch Patch89: httpd-2.0.49-headerssl.patch Patch90: httpd-2.0.49-workerstack.patch -Patch91: httpd-2.0.49-suexecmsg.patch +Patch91: httpd-2.0.46-testhook.patch +Patch92: httpd-2.0.46-dumpcerts.patch License: Apache Software License Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-root BuildRequires: db4-devel, expat-devel, findutils, perl, pkgconfig, xmlto >= 0.0.11 -BuildRequires: apr-devel >= 0.9.4-15, apr-util-devel, pcre-devel +BuildRequires: apr-devel >= 0.9.4-20, apr-util-devel, pcre-devel Requires: /etc/mime.types, gawk, /usr/share/magic.mime, /usr/bin/find +Requires: httpd-suexec Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv Prereq: sh-utils, textutils, /usr/sbin/useradd Provides: webserver @@ -107,6 +110,7 @@ to install this package. %package manual Group: Documentation Summary: Documentation for the Apache HTTP server. +Requires: httpd = %{version}-%{release} Obsoletes: secureweb-manual, apache-manual %description manual @@ -182,7 +186,8 @@ executed by SSI pages) as a user other than the 'apache' user. %patch86 -p1 -b .rewritessl %patch89 -p1 -b .headerssl %patch90 -p1 -b .workerstack -%patch91 -p1 -b .suexecmsg +%patch91 -p1 -b .testhook +%patch92 -p1 -b .dumpcerts # Patch in vendor/release string sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1 @@ -314,11 +319,10 @@ ln -s ../pcre/pcreposix.h $RPM_BUILD_ROOT%{_includedir}/httpd/pcreposix.h # install conf file/directory mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d install -m 644 $RPM_SOURCE_DIR/README.confd \ - $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README -install -m 644 $RPM_SOURCE_DIR/ssl.conf \ - $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ssl.conf -install -m 644 $RPM_SOURCE_DIR/welcome.conf \ - $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/welcome.conf + $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README +for f in ssl.conf welcome.conf manual.conf; do + install -m 644 $RPM_SOURCE_DIR/$f $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f +done rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf install -m 644 $RPM_SOURCE_DIR/httpd.conf \ @@ -550,6 +554,7 @@ rm -rf $RPM_BUILD_ROOT %files manual %defattr(-,root,root) %{contentdir}/manual +%config(noreplace) %{_sysconfdir}/httpd/conf.d/manual.conf %files -n mod_ssl %defattr(-,root,root) @@ -580,6 +585,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/suexec.8* %changelog +* Wed Sep 1 2004 Joe Orton <jorton@redhat.com> 2.0.50-5 +- move manual configuration into conf.d/manual.conf (#131208) +- add test_hook from HEAD, -t -DDUMP_CERTS for mod_ssl +- document AddDefaultCharset change since 1.3 in migration.html + * Tue Aug 17 2004 Joe Orton <jorton@redhat.com> 2.0.50-4 - start httpd in the C locale by default (#128002) - fix CustomLog comments in default httpd.conf (#43223) @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> - <title>Test Page for the Apache HTTP Server on Red Hat Enterprise Linux</title> + <title>Test Page for the Apache HTTP Server on Fedora Core</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <style type="text/css"> /*<![CDATA[*/ @@ -27,7 +27,7 @@ text-align: center; margin: 0; padding: 0.6em 2em 0.4em; - background-color: #900; + background-color: #22437f; color: #fff; font-weight: normal; font-size: 1.75em; @@ -85,7 +85,7 @@ </head> <body> - <h1>Red Hat Enterprise Linux <strong>Test Page</strong></h1> + <h1>Fedora Core <strong>Test Page</strong></h1> <div class="content"> <div class="content-middle"> @@ -103,7 +103,7 @@ <p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster@example.com".</p> - <p>For information on Red Hat Enterprise Linux, please visit the <a href="http://www.redhat.com/">Red Hat, Inc. website</a>. The documentation for Red Hat Enterprise Linux is <a href="http://www.redhat.com/docs/manuals/enterprise/">available on the Red Hat, Inc. website</a>.</p> + <p>For information on Fedora Core, please visit the <a href="http://fedora.redhat.com/">Fedora Project website</a>.</p> <hr /> </div> @@ -113,9 +113,9 @@ <p>You may now add content to the directory <tt>/var/www/html/</tt>. Note that until you do so, people visiting your website will see this page, and not your content. To prevent this page from ever being used, follow the instructions in the file <tt>/etc/httpd/conf.d/welcome.conf</tt>.</p> <div class="logos"> - <p>You are free to use the images below on Apache and Red Hat powered HTTP servers. Thanks for using Apache and Red Hat Enterprise Linux!</p> + <p>You are free to use the images below on Apache and Fedora Core powered HTTP servers. Thanks for using Apache and Fedora Core!</p> - <p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://www.redhat.com/"><img src="/icons/powered_by_rh.png" alt="[ Powered by Red Hat ]" width="88" height="31" /></a></p> + <p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedora.redhat.com/"><img src="/icons/powered_by_fedora.png" alt="[ Powered by Fedora Core ]" width="88" height="31" /></a></p> </div> </div> </div> diff --git a/manual.conf b/manual.conf new file mode 100644 index 0000000..eed5843 --- /dev/null +++ b/manual.conf @@ -0,0 +1,24 @@ +# +# This configuration file allows the manual to be accessed at +# http://localhost/manual/ +# +AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/var/www/manual$1" + +<Directory "/var/www/manual"> + Options Indexes + AllowOverride None + Order allow,deny + Allow from all + + <Files *.html> + SetHandler type-map + </Files> + + SetEnvIf Request_URI ^/manual/de/ prefer-language=de + SetEnvIf Request_URI ^/manual/en/ prefer-language=en + SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr + SetEnvIf Request_URI ^/manual/ja/ prefer-language=ja + SetEnvIf Request_URI ^/manual/ko/ prefer-language=ko + SetEnvIf Request_URI ^/manual/ru/ prefer-language=ru + RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2 +</Directory> diff --git a/migration.xml b/migration.xml index 1c4525c..12de8b6 100644 --- a/migration.xml +++ b/migration.xml @@ -456,6 +456,35 @@ url="http://httpd.apache.org/docs-2.0/mod/core.html#errordocument"><literal>Erro </itemizedlist></para> </sect3> + +<sect3> +<title>Default Character Set</title> + +<para>The default character set which will be sent in a +<literal>Content-Type</literal> header has changed from previous +versions. By default, the configuration in &distro; uses a UTF-8 +locale, the default character set used in &httpdconf; is now +<literal>utf-8</literal>, rather than the previous default of +<literal>ISO-8859-1</literal>.</para> + +<para>To configure the server to use a default character set of +ISO-8859-1 if migrating non-UTF-8 content, change: + +<informalexample> +<programlisting> +AddDefaultCharset utf-8 +</programlisting> +</informalexample> + +to + +<informalexample> +<programlisting> +AddDefaultCharset <emphasis role="bold">ISO-8859-1</emphasis> +</programlisting> +</informalexample></para> + +</sect3> </sect2> <sect2> |