From 9f9ccbc5d357f396e58955c1ab92e4d072ef49bf Mon Sep 17 00:00:00 2001 From: jorton Date: Dec 05 2005 17:26:03 +0000 Subject: - don't strip C-L from HEAD responses (Greg Ames, #110552) - load mod_proxy_balancer by default - add proxy_ajp.conf to load/configure mod_proxy_ajp - Obsolete mod_jk - update docs URLs in httpd.conf/ssl.conf --- diff --git a/httpd.conf b/httpd.conf index 464751d..ddfe7c9 100644 --- a/httpd.conf +++ b/httpd.conf @@ -49,7 +49,7 @@ ServerTokens OS # # NOTE! If you intend to place this on an NFS (or otherwise network) # mounted filesystem then please read the LockFile documentation -# (available at ); +# (available at ); # you will save yourself a lot of trouble. # # Do NOT add a slash at the end of the directory path. @@ -186,6 +186,7 @@ LoadModule userdir_module modules/mod_userdir.so LoadModule alias_module modules/mod_alias.so LoadModule rewrite_module modules/mod_rewrite.so LoadModule proxy_module modules/mod_proxy.so +LoadModule proxy_balancer_module modules/mod_proxy_balancer.so LoadModule proxy_ftp_module modules/mod_proxy_ftp.so LoadModule proxy_http_module modules/mod_proxy_http.so LoadModule proxy_connect_module modules/mod_proxy_connect.so @@ -312,7 +313,7 @@ DocumentRoot "/var/www/html" # doesn't give it to you. # # The Options directive is both complicated and important. Please see -# http://httpd.apache.org/docs-2.0/mod/core.html#options +# http://httpd.apache.org/docs/2.2/mod/core.html#options # for more information. # Options Indexes FollowSymLinks @@ -447,7 +448,7 @@ HostnameLookups Off # The default is on; turn this off if you serve from NFS-mounted # filesystems. On some systems, turning it off (regardless of # filesystem) can improve performance; for details, please see -# http://httpd.apache.org/docs-2.0/mod/core.html#enablemmap +# http://httpd.apache.org/docs/2.2/mod/core.html#enablemmap # #EnableMMAP off @@ -456,7 +457,7 @@ HostnameLookups Off # used to deliver files (assuming that the OS supports it). # The default is on; turn this off if you serve from NFS-mounted # filesystems. Please see -# http://httpd.apache.org/docs-2.0/mod/core.html#enablesendfile +# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile # #EnableSendfile off @@ -936,7 +937,7 @@ BrowserMatch "^gnome-vfs" redirect-carefully # # To enable a cache of proxied content, uncomment the following lines. -# See http://httpd.apache.org/docs-2.0/mod/mod_cache.html for more details. +# See http://httpd.apache.org/docs/2.2/mod/mod_cache.html for more details. # # # CacheEnable disk / @@ -955,7 +956,7 @@ BrowserMatch "^gnome-vfs" redirect-carefully # IP addresses. This is indicated by the asterisks in the directives below. # # Please see the documentation at -# +# # for further details before you try to setup virtual hosts. # # You may use the command line option '-S' to verify your virtual host diff --git a/httpd.spec b/httpd.spec index 819bebb..af2e4e6 100644 --- a/httpd.spec +++ b/httpd.spec @@ -7,7 +7,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.2.0 -Release: 1 +Release: 2 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -19,6 +19,7 @@ Source10: httpd.conf Source11: ssl.conf Source12: welcome.conf Source13: manual.conf +Source14: proxy_ajp.conf # Documentation Source30: migration.xml Source31: migration.css @@ -39,6 +40,7 @@ Patch24: httpd-2.0.48-corelimit.patch Patch25: httpd-2.0.54-selinux.patch # Bug fixes Patch50: httpd-2.0.45-encode.patch +Patch51: httpd-2.2.0-headclength.patch License: Apache Software License Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-root @@ -52,7 +54,7 @@ Prereq: sh-utils, textutils, /usr/sbin/useradd Provides: webserver Provides: httpd-mmn = %{mmn} Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache, stronghold-htdocs -Obsoletes: mod_put, mod_roaming +Obsoletes: mod_put, mod_roaming, mod_jk Conflicts: pcre < 4.0 %description @@ -84,7 +86,7 @@ Obsoletes: secureweb-manual, apache-manual %description manual The httpd-manual package contains the complete manual and reference guide for the Apache HTTP server. The information can -also be found at http://httpd.apache.org/docs-2.0/. +also be found at http://httpd.apache.org/docs/2.2/. %package -n mod_ssl Group: System Environment/Daemons @@ -116,6 +118,7 @@ Security (TLS) protocols. # no -b to prevent droplets in install root %patch50 -p1 +%patch51 -p1 -b .headclength # Patch in vendor/release string sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 @@ -221,7 +224,7 @@ install -m 755 worker/httpd $RPM_BUILD_ROOT%{_sbindir}/httpd.worker mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d install -m 644 $RPM_SOURCE_DIR/README.confd \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README -for f in ssl.conf welcome.conf manual.conf; do +for f in ssl.conf welcome.conf manual.conf proxy_ajp.conf; do install -m 644 $RPM_SOURCE_DIR/$f $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/$f done @@ -400,6 +403,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/httpd/conf %config %{_sysconfdir}/httpd/conf/httpd.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/welcome.conf +%config(noreplace) %{_sysconfdir}/httpd/conf.d/proxy_ajp.conf %config(noreplace) %{_sysconfdir}/httpd/conf/magic %config(noreplace) %{_sysconfdir}/logrotate.d/httpd @@ -465,6 +469,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/httpd/build/*.sh %changelog +* Mon Dec 5 2005 Joe Orton 2.2.0-2 +- don't strip C-L from HEAD responses (Greg Ames, #110552) +- load mod_proxy_balancer by default +- add proxy_ajp.conf to load/configure mod_proxy_ajp +- Obsolete mod_jk +- update docs URLs in httpd.conf/ssl.conf + * Fri Dec 2 2005 Joe Orton 2.2.0-1 - update to 2.2.0 diff --git a/proxy_ajp.conf b/proxy_ajp.conf new file mode 100644 index 0000000..9347aab --- /dev/null +++ b/proxy_ajp.conf @@ -0,0 +1,20 @@ + +LoadModule proxy_ajp_module modules/mod_proxy_ajp.so + +# +# When loaded, the mod_proxy_ajp module adds support for +# proxying to an AJP/1.3 backend server (such as Tomcat). +# To proxy to an AJP backend, use the "ajp://" URI scheme; +# Tomcat is configured to listen on port 8009 for AJP requests +# by default. +# + +# +# Uncomment the following lines to serve the ROOT webapp +# under the /tomcat/ location, and the jsp-examples webapp +# under the /examples/ location. +# +#ProxyPass /tomcat/ ajp://localhost:8009/ +#ProxyPass /examples/ ajp://localhost:8009/jsp-examples/ + + diff --git a/ssl.conf b/ssl.conf index 738ae3b..647a4a4 100644 --- a/ssl.conf +++ b/ssl.conf @@ -2,7 +2,7 @@ # This is the Apache server configuration file providing SSL support. # It contains the configuration directives to instruct the server how to # serve pages over an https connection. For detailing information about these -# directives see +# directives see # # Do NOT simply read the instructions in here without understanding # what they do. They're here only as hints or reminders. If you are unsure @@ -11,14 +11,9 @@ LoadModule ssl_module modules/mod_ssl.so -# Until documentation is completed, please check http://www.modssl.org/ -# for additional config examples and module docmentation. Directives -# and features of mod_ssl are largely unchanged from the mod_ssl project -# for Apache 1.3. - # # When we also provide SSL we have to listen to the -# standard HTTP port (see above) and to the HTTPS port +# the HTTPS port in addition. # Listen 443