diff --git a/apache2-server-tuning.conf b/apache2-server-tuning.conf index e50ef24..c4ba4c8 100644 --- a/apache2-server-tuning.conf +++ b/apache2-server-tuning.conf @@ -109,26 +109,26 @@ KeepAliveTimeout 15 # #EnableSendfile off + + # + # The following directives modify normal HTTP response behavior to + # handle known problems with browser implementations. + # + BrowserMatch "Mozilla/2" nokeepalive + BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 + BrowserMatch "RealPlayer 4\.0" force-response-1.0 + BrowserMatch "Java/1\.0" force-response-1.0 + BrowserMatch "JDK/1\.0" force-response-1.0 -# -# The following directives modify normal HTTP response behavior to -# handle known problems with browser implementations. -# -BrowserMatch "Mozilla/2" nokeepalive -BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0 -BrowserMatch "RealPlayer 4\.0" force-response-1.0 -BrowserMatch "Java/1\.0" force-response-1.0 -BrowserMatch "JDK/1\.0" force-response-1.0 - -# -# The following directive disables redirects on non-GET requests for -# a directory that does not include the trailing slash. This fixes a -# problem with Microsoft WebFolders which does not appropriately handle -# redirects for folders with DAV methods. -# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. -# -BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully -BrowserMatch "^WebDrive" redirect-carefully -BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully -BrowserMatch "^gnome-vfs" redirect-carefully - + # + # The following directive disables redirects on non-GET requests for + # a directory that does not include the trailing slash. This fixes a + # problem with Microsoft WebFolders which does not appropriately handle + # redirects for folders with DAV methods. + # Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. + # + BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully + BrowserMatch "^WebDrive" redirect-carefully + BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully + BrowserMatch "^gnome-vfs" redirect-carefully + diff --git a/apache2.changes b/apache2.changes index 822bcbb..4279032 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Nov 21 12:01:00 CET 2008 - skh@suse.de + +- apache2-server-tuning.conf: + Enclose module-specific configuration in IfModule tags [bnc#440584] + +------------------------------------------------------------------- +Fri Nov 14 09:40:05 CET 2008 - poeml@suse.de + +- apply Dirks fix for [bnc#444878], making the packaging of per-mpm + modules more deterministic. They'll reliably put into the + subpackage or main package now, which varied in a ping-pong way + from build to build in the past. + ------------------------------------------------------------------- Wed Oct 29 18:38:17 CET 2008 - poeml@suse.de diff --git a/apache2.spec b/apache2.spec index f6c2501..afa228b 100644 --- a/apache2.spec +++ b/apache2.spec @@ -63,7 +63,7 @@ License: The Apache Software License Group: Productivity/Networking/Web/Servers %define realver 2.2.10 Version: 2.2.10 -Release: 1 +Release: 2 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2 Source10: SUSE-NOTICE @@ -485,10 +485,18 @@ sed -e "s^/usr/%_lib/%{pname}-%{default_mpm}^/usr/%_lib/%{pname}^" \ # get rid of modules that do not differ between the MPMs (since most of them are the same) # by putting them in /usr/lib/apache%{vers} ldir=$RPM_BUILD_ROOT/%{libexecdir} -for i in $(cd $ldir-%{default_mpm}; ls -1); do +for i in $(cd $ldir-%{default_mpm}; ls -1 *.so); do identical=true for mpm in %{mpms_to_build}; do - cmp -s $ldir-{%{default_mpm},$mpm}/$i || identical=false + if test -f $ldir-$mpm/$i -a -f $ldir-%{default_mpm}/$i; then + objcopy --strip-debug $ldir-$mpm/$i $ldir-$mpm/$i.tst + objcopy --strip-debug $ldir-%{default_mpm}/$i $ldir-%{default_mpm}/$i.tst + ls -l $ldir-{%{default_mpm},$mpm}/$i* + cmp -s $ldir-{%{default_mpm},$mpm}/$i.tst || identical=false + rm -f $ldir-{%{default_mpm},$mpm}/$i.tst + else + identical=false + fi done if $identical; then cp -dp $ldir-%{default_mpm}/$i $ldir @@ -1023,6 +1031,14 @@ if ! test -f /.buildenv; then fi %changelog +* Fri Nov 21 2008 skh@suse.de +- apache2-server-tuning.conf: + Enclose module-specific configuration in IfModule tags [bnc#440584] +* Fri Nov 14 2008 poeml@suse.de +- apply Dirks fix for [bnc#444878], making the packaging of per-mpm + modules more deterministic. They'll reliably put into the + subpackage or main package now, which varied in a ping-pong way + from build to build in the past. * Wed Oct 29 2008 poeml@suse.de - update year of copyright in rc.apache2 * Wed Oct 29 2008 poeml@suse.de @@ -1866,7 +1882,7 @@ fi * Mon Jun 12 2006 poeml@suse.de - enable logresolve processing of lines longer than 1024 characters by compiling with MAXLINE=4096 [#162806] -* Sat Jun 10 2006 poeml@suse.de +* Fri Jun 09 2006 poeml@suse.de - upstream 2.2.2 | SECURITY: CVE-2005-3357 (cve.mitre.org) | mod_ssl: Fix a possible crash during access control checks @@ -2137,7 +2153,7 @@ fi - Escape also any forward slash while removing a word with sysconf_addword. * Fri Aug 26 2005 lmuelle@suse.de - Escape any forward slash in the word argument of sysconf_addword. -* Sun Aug 14 2005 ro@suse.de +* Sat Aug 13 2005 ro@suse.de - alingn suexec2 permissions with permissions.secure * Thu Aug 11 2005 poeml@suse.de - the permissions files are now maintained centrally and packaged @@ -2150,7 +2166,7 @@ fi - add charset.conv table for mod_auth_ldap - make sure that suse_version is defined (it might be unset by e.g. ISPs preinstallations) -* Wed Jul 13 2005 poeml@suse.de +* Tue Jul 12 2005 poeml@suse.de - security fix [CAN-2005-2088 (cve.mitre.org)]: core: If a request contains both Transfer-Encoding and a Content-Length, remove the Content-Length, stopping some HTTP Request smuggling attacks. @@ -3025,7 +3041,7 @@ fi might be too obvious: the document root [#29674] - in %%post, diff to httpd.conf.default only when .rpmnew is present - improve message sent on update -* Sat Aug 30 2003 poeml@suse.de +* Fri Aug 29 2003 poeml@suse.de - improve documentation on configuration - compile with -Wall - do not obsolete httpddoc, which is provided by apache-doc package @@ -3344,7 +3360,7 @@ fi - fix last fix (rpm macro before hash wasn't expanded) * Fri Jan 10 2003 poeml@suse.de - fix lib64 path in SuSEconfig -* Sat Jan 04 2003 poeml@suse.de +* Fri Jan 03 2003 poeml@suse.de - fix typo in spec file, preventing replacement of @userdir@ in httpd.conf-std.in * Wed Dec 18 2002 poeml@suse.de @@ -3467,7 +3483,7 @@ fi evaluated - libmm is not needed for building (and it is not threadsafe) - fix config.layout for the moved server root -* Sat Aug 03 2002 poeml@suse.de +* Fri Aug 02 2002 poeml@suse.de - fix libdir in config.layout for lib64 * Fri Aug 02 2002 poeml@suse.de - fix RPM Requires