From 22b674063e23c2765abb4c126bbfe6db56b139d0 Mon Sep 17 00:00:00 2001 From: jorton Date: Mar 29 2005 12:19:40 +0000 Subject: - update default httpd.conf: clarify the comments on AddDefaultCharset usage (#135821) remove all the AddCharset default extensions don't load mod_imap by default synch with upstream 2.0.53 httpd-std.conf - remove htsslpass - mod_ssl: set user from SSLUserName in access hook (upstream #31418) - htdigest: fix permissions of created files (upstream #33765) --- diff --git a/httpd.conf b/httpd.conf index 0b49d38..481cc65 100644 --- a/httpd.conf +++ b/httpd.conf @@ -153,6 +153,7 @@ LoadModule ldap_module modules/mod_ldap.so LoadModule auth_ldap_module modules/mod_auth_ldap.so LoadModule include_module modules/mod_include.so LoadModule log_config_module modules/mod_log_config.so +LoadModule logio_module modules/mod_logio.so LoadModule env_module modules/mod_env.so LoadModule mime_magic_module modules/mod_mime_magic.so LoadModule cern_meta_module modules/mod_cern_meta.so @@ -171,7 +172,6 @@ LoadModule dav_fs_module modules/mod_dav_fs.so LoadModule vhost_alias_module modules/mod_vhost_alias.so LoadModule negotiation_module modules/mod_negotiation.so LoadModule dir_module modules/mod_dir.so -LoadModule imap_module modules/mod_imap.so LoadModule actions_module modules/mod_actions.so LoadModule speling_module modules/mod_speling.so LoadModule userdir_module modules/mod_userdir.so @@ -187,7 +187,6 @@ LoadModule disk_cache_module modules/mod_disk_cache.so LoadModule file_cache_module modules/mod_file_cache.so LoadModule mem_cache_module modules/mod_mem_cache.so LoadModule cgi_module modules/mod_cgi.so -LoadModule logio_module modules/mod_logio.so # # Load config files from the config directory "/etc/httpd/conf.d". @@ -247,7 +246,7 @@ ServerAdmin root@localhost # You will have to access it by its address anyway, and this will make # redirections work in a sensible way. # -#ServerName new.host.name:80 +#ServerName www.example.com:80 # # UseCanonicalName: Determines how Apache constructs self-referencing @@ -472,6 +471,10 @@ LogFormat "%h %l %u %t \"%r\" %>s %b" common LogFormat "%{Referer}i -> %U" referer LogFormat "%{User-agent}i" agent +# "combinedio" includes actual counts of actual bytes received (%I) and sent (%O); this +# requires the mod_logio module to be loaded. +#LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + # # The location and format of the access logfile (Common Logfile Format). # If you do not define any access logfiles within a @@ -482,8 +485,8 @@ LogFormat "%{User-agent}i" agent #CustomLog logs/access_log common # -# If you would like to have agent and referer logfiles, uncomment the -# following directives. +# If you would like to have separate agent and referer logfiles, uncomment +# the following directives. # #CustomLog logs/referer_log referer #CustomLog logs/agent_log agent @@ -719,64 +722,15 @@ LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt ForceLanguagePriority Prefer Fallback # -# Specify a default charset for all pages sent out. This is -# always a good idea and opens the door for future internationalisation -# of your web site, should you ever want it. Specifying it as -# a default does little harm; as the standard dictates that a page -# is in iso-8859-1 (latin1) unless specified otherwise i.e. you -# are merely stating the obvious. There are also some security -# reasons in browsers, related to javascript and URL parsing -# which encourage you to always set a default char set. +# Specify a default charset for all content served; this enables +# interpretation of all content as UTF-8 by default. To use the +# default browser choice (ISO-8859-1), or to allow the META tags +# in HTML content to override this choice, comment out this +# directive: # AddDefaultCharset UTF-8 # -# Commonly used filename extensions to character sets. You probably -# want to avoid clashes with the language extensions, unless you -# are good at carefully testing your setup after each change. -# See http://www.iana.org/assignments/character-sets for the -# official list of charset names and their respective RFCs. -# -AddCharset ISO-8859-1 .iso8859-1 .latin1 -AddCharset ISO-8859-2 .iso8859-2 .latin2 .cen -AddCharset ISO-8859-3 .iso8859-3 .latin3 -AddCharset ISO-8859-4 .iso8859-4 .latin4 -AddCharset ISO-8859-5 .iso8859-5 .latin5 .cyr .iso-ru -AddCharset ISO-8859-6 .iso8859-6 .latin6 .arb -AddCharset ISO-8859-7 .iso8859-7 .latin7 .grk -AddCharset ISO-8859-8 .iso8859-8 .latin8 .heb -AddCharset ISO-8859-9 .iso8859-9 .latin9 .trk -AddCharset ISO-2022-JP .iso2022-jp .jis -AddCharset ISO-2022-KR .iso2022-kr .kis -AddCharset ISO-2022-CN .iso2022-cn .cis -AddCharset Big5 .Big5 .big5 -# For russian, more than one charset is used (depends on client, mostly): -AddCharset WINDOWS-1251 .cp-1251 .win-1251 -AddCharset CP866 .cp866 -AddCharset KOI8-r .koi8-r .koi8-ru -AddCharset KOI8-ru .koi8-uk .ua -AddCharset ISO-10646-UCS-2 .ucs2 -AddCharset ISO-10646-UCS-4 .ucs4 -AddCharset UTF-8 .utf8 - -# The set below does not map to a specific (iso) standard -# but works on a fairly wide range of browsers. Note that -# capitalization actually matters (it should not, but it -# does for some browsers). -# -# See http://www.iana.org/assignments/character-sets -# for a list of sorts. But browsers support few. -# -AddCharset GB2312 .gb2312 .gb -AddCharset utf-7 .utf7 -AddCharset utf-8 .utf8 -AddCharset big5 .big5 .b5 -AddCharset EUC-TW .euc-tw -AddCharset EUC-JP .euc-jp -AddCharset EUC-KR .euc-kr -AddCharset shift_jis .sjis - -# # AddType allows you to add to or override the MIME configuration # file mime.types for specific file types. # @@ -813,11 +767,6 @@ AddType application/x-gzip .gz .tgz #AddHandler send-as-is asis # -# For server-parsed imagemap files: -# -AddHandler imap-file map - -# # For type maps (negotiated resources): # (This is enabled by default to allow the Apache "It Worked" page # to be distributed in multiple languages.) diff --git a/httpd.init b/httpd.init index 6c9c874..46fa126 100755 --- a/httpd.init +++ b/httpd.init @@ -77,7 +77,7 @@ reload() { if ! LANG=$HTTPD_LANG $httpd $OPTIONS -t >&/dev/null; then RETVAL=$? echo $"not reloading due to configuration syntax error" - failure $"Not reloading $httpd due to configuration syntax errors" + failure $"not reloading $httpd due to configuration syntax error" else killproc $httpd -HUP RETVAL=$? diff --git a/httpd.spec b/httpd.spec index 692cf51..61cbd61 100644 --- a/httpd.spec +++ b/httpd.spec @@ -7,7 +7,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.0.53 -Release: 5 +Release: 6 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -23,13 +23,11 @@ Source12: welcome.conf Source13: manual.conf Source14: mod_ssl-Makefile.crt Source15: mod_ssl-Makefile.crl -Source16: htsslpass.c # Documentation Source30: migration.xml Source31: migration.css Source32: html.xsl Source33: README.confd -Source34: htsslpass.xml # build/scripts patches Patch1: httpd-2.0.40-apctl.patch Patch2: httpd-2.0.36-apxs.patch @@ -52,6 +50,8 @@ Patch28: httpd-2.0.48-worker.patch Patch29: httpd-2.0.48-workerhup.patch Patch30: httpd-2.0.48-davmisc.patch Patch39: httpd-2.0.50-reclaim.patch +Patch40: httpd-2.0.52-htdigperms.patch +Patch41: httpd-2.0.52-ssluser.patch # Features/functional changes Patch70: httpd-2.0.48-release.patch Patch71: httpd-2.0.40-xfsz.patch @@ -165,6 +165,8 @@ executed by SSI pages) as a user other than the 'apache' user. %patch29 -p1 -b .workerhup %patch30 -p1 -b .davmisc %patch39 -p1 -b .reclaim +%patch40 -p1 -b .htdigperms +%patch41 -p1 -b .ssluser %patch71 -p0 -b .xfsz %patch72 -p1 -b .pod @@ -233,13 +235,6 @@ sed 's/@DISTRO@/%{distro}/' < $RPM_SOURCE_DIR/migration.xml > migration.xml xmlto -x $RPM_SOURCE_DIR/html.xsl html-nochunks migration.xml cp $RPM_SOURCE_DIR/migration.css . # make %%doc happy -# Build the htsslpass man page -xmlto man $RPM_SOURCE_DIR/htsslpass.xml - -# Build htsslpass -cp $RPM_SOURCE_DIR/htsslpass.c . || exit 1 -gcc $RPM_OPT_FLAGS -Wall -Werror htsslpass.c -o htsslpass - CFLAGS=$RPM_OPT_FLAGS CPPFLAGS="-DSSL_EXPERIMENTAL_ENGINE" export CFLAGS CPPFLAGS @@ -305,10 +300,6 @@ install -m 755 worker/httpd $RPM_BUILD_ROOT%{_sbindir}/httpd.worker # link to system pcreposix.h ln -s ../pcreposix.h $RPM_BUILD_ROOT%{_includedir}/httpd/pcreposix.h -# install htsslpass(1) and man page -install -m 755 htsslpass $RPM_BUILD_ROOT%{_bindir}/htsslpass -install -m 644 htsslpass.1 $RPM_BUILD_ROOT%{_mandir}/man1/htsslpass.1 - # install conf file/directory mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d install -m 644 $RPM_SOURCE_DIR/README.confd \ @@ -532,7 +523,6 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/httpd.worker %{_sbindir}/apachectl %{_sbindir}/rotatelogs -%exclude %{_bindir}/htsslpass %dir %{_libdir}/httpd %dir %{_libdir}/httpd/modules @@ -558,7 +548,6 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man?/* %exclude %{_mandir}/man8/apxs.8* %exclude %{_mandir}/man8/suexec.8* -%exclude %{_mandir}/man1/htsslpass.1* %files manual %defattr(-,root,root) @@ -567,8 +556,6 @@ rm -rf $RPM_BUILD_ROOT %files -n mod_ssl %defattr(-,root,root) -%{_bindir}/htsslpass -%{_mandir}/man1/htsslpass.1* %{_libdir}/httpd/modules/mod_ssl.so %config(noreplace) %{_sysconfdir}/httpd/conf.d/ssl.conf %attr(0700,root,root) %dir %{_sysconfdir}/httpd/conf/ssl.* @@ -596,6 +583,16 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/suexec.8* %changelog +* Tue Mar 29 2005 Joe Orton 2.0.53-6 +- update default httpd.conf: + * clarify the comments on AddDefaultCharset usage (#135821) + * remove all the AddCharset default extensions + * don't load mod_imap by default + * synch with upstream 2.0.53 httpd-std.conf +- mod_ssl: set user from SSLUserName in access hook (upstream #31418) +- htdigest: fix permissions of created files (upstream #33765) +- remove htsslpass + * Wed Mar 2 2005 Joe Orton 2.0.53-5 - apachectl: restore use of $OPTIONS again