Accepting request 80399 from home:elvigia:branches:Apache

- Update to version 2.2.20, fix CVE-2011-3192 
  mod_deflate D.o.S.

-  Fix apache PR 45076 

- Use SSL_MODE_RELEASE_BUFFERS to reduce mod_ssl memory usage

- Add 2 patches from the "low hanging fruit" warnings in apache
  STATUS page.
 * mod_deflate: Stop compressing HEAD requests 
  if there is not Content-Length header 
 * mod_reqtimeout: Disable keep-alive after read timeout

- Remove -fno-strict-aliasing from CFLAGS, no longer needed.

- Allow KeepAliveTimeout to be expressed in miliseconds
  sometimes one second is too long, upstream r733557.

- When linux changes to version 3.x configure tests are gonna break.
  remove version check, assuming kernel 2.2 or later.

OBS-URL: https://build.opensuse.org/request/show/80399
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=334

apache2.spec

@@ -67,8 +67,8 @@ BuildRequires:  expat-devel
 %define platform_string	Linux/%VENDOR
 License:        ASLv..
 Group:          Productivity/Networking/Web/Servers
-%define realver 2.2.19
-Version:        2.2.19
+%define realver 2.2.20
+Version:        2.2.20
 Release:        1
 #Source0:      http://www.apache.org/dist/httpd-%{version}.tar.bz2
 Source0:        http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2
@@ -123,6 +123,10 @@ Patch66:        httpd-2.0.54-envvars.dif
 Patch67:        httpd-2.2.0-apxs-a2enmod.dif
 Patch68:        httpd-2.x.x-logresolve.patch
 Patch100:       apache2.2-mpm-itk-20090414-00.patch
+Patch101:       httpd-2.2.19-linux3.patch
+Patch102:       httpd-keepalivetimeout-millisecs.patch
+Patch104:       httpd-mod_deflate_head.patch
+Patch105:       ssl-mode-release-buffers.patch
 Url:            http://httpd.apache.org/
 Icon:           Apache.xpm
 Summary:        The Apache Web Server Version 2.0
@@ -340,6 +344,10 @@ to administrators of web servers in general.
 %patch67 -p1
 %patch68 -p1
 %patch100
+%patch101
+%patch102
+%patch104
+%patch105
 #
 cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
 #
@@ -354,8 +362,7 @@ sed -i -e "s/__DATE__ \" \" __TIME__;/\"$CHANGES\";/" server/buildmark.c
 # now configure Apache 
 #
 %if 0%{?suse_version} > 910
-aclocal
-autoreconf --force --install
+autoreconf -fiv
 %else
 rm -rf aclocal.m4 autom4te*.cache
 autoheader
@@ -368,7 +375,7 @@ autoconf
 #  /O |_)|_|||(_|
 #
 function configure {
-	CFLAGS="$RPM_OPT_FLAGS -fPIC -Wall -fno-strict-aliasing -DLDAP_DEPRECATED" \
+	CFLAGS="$RPM_OPT_FLAGS -fPIC -Wall -DLDAP_DEPRECATED" \
 	CPPFLAGS="-DSSL_EXPERIMENTAL_ENGINE -DMAX_SERVER_LIMIT=200000 -DLDAP_DEPRECATED -DMAXLINE=4096" \
 	./configure \
 		--enable-layout=SuSE81%(test "%_lib" = lib64 && echo -n _64) \
@@ -455,7 +462,6 @@ for mpm in %{mpms_to_build}; do
 	mv include/ap_config_auto.h.new include/ap_config_auto.h
 
 	make CFLAGS="$RPM_OPT_FLAGS -fPIC \
-		-fno-strict-aliasing \
 		-Wall \
 		-DDEFAULT_PIDLOG='\"%{runtimedir}/%{httpd}.pid\"' \
 		-DDEFAULT_ERRORLOG='\"%{logfiledir}/error_log\"' " \