diff --git a/apache2.changes b/apache2.changes index fd47727..c82b011 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,8 +1,134 @@ +------------------------------------------------------------------- +Tue Jan 9 15:59:42 CET 2007 - poeml@suse.de + +- upstream 2.2.4 + mod_authnz_ldap: + - Add an AuthLDAPRemoteUserAttribute directive. If set, + REMOTE_USER will be set to this attribute, rather than the + username supplied by the user. Useful for example when you + want users to log in using an email address, but need to + supply a userid instead to the backend. + mod_cache: + - From RFC3986 (section 6.2.3.) if a URI contains an authority + component and an empty path, the empty path is to be + equivalent to "/". It explicitly cites the following four URIs + as equivalents: + http://example.com + http://example.com/ + http://example.com:/ + http://example.com:80/ + - Eliminate a bogus error in the log when a filter returns + AP_FILTER_ERROR. + - Don't cache requests with a expires date in the past; + otherwise mod_cache will always try to cache the URL. This bug + might lead to numerous rename() errors on win32 if the URL was + previously cached. + mod_cgi and mod_cgid: + - Don't use apr_status_t error return from input filters as HTTP + return value from the handler. PR 31579. + mod_dbd: + - share per-request database handles across subrequests and + internal redirects + - key connection pools to virtual hosts correctly even when + ServerName is unset/unavailable + mod_deflate: + - Rework inflate output and deflate output filter to fix several + issues: Incorrect handling of flush buckets, potential memory + leaks, excessive memory usage in inflate output filter for + large compressed content. PR 39854. + mod_disk_cache: + - Make sure that only positive integers are accepted for the + CacheMaxFileSize and CacheMinFileSize parameters in the config + file. PR39380. + mod_dumpio: + - Allow mod_dumpio to log at other than DEBUG levels via the new + DumpIOLogLevel directive. + mod_echo: + - Fix precedence problem in if statement. PR 40658. + mod_ext_filter: + - Handle filter names which include capital letters. PR 40323. + mod_headers: + - Support regexp-based editing of HTTP headers. + mod_mime_magic: + - Fix precedence problem in if statement. PR 40656. + mod_mem_cache: + - Memory leak fix: Unconditionally free the buffer. + - Convert mod_mem_cache to use APR memory pool functions by + creating a root pool for object persistence across requests. + This also eliminates the need for custom serialization code. + mod_proxy: + - Don't try to use dead backend connection. PR 37770. + - Add explicit flushing feature. When Servlet container sends + AJP body message with size 0, this means that Servlet + container has asked for an explicit flush. Create flush bucket + in that case. This feature has been added to the recent Tomcat + versions without breaking the AJP protocol. + mod_proxy_ajp: + - Close connection to backend if reading of request body fails. + PR 40310. + - Added cping/cpong support for the AJP protocol. A new worker + directive ping=timeout will cause CPING packet to be send + expecting CPONG packet within defined timeout. In case the + backend is too busy this will fail instead sending the full + header. + mod_proxy_balancer: + - Workers can now be defined as part of a balancer cluster "set" + in which members of a lower-numbered set are preferred over + higher numbered ones. + - Workers can now be defined as "hot standby" which will only be + used if all other workers are unusable (eg: in error or + disabled). Also, the balancer-manager displays the election + count and I/O counts of all workers. + - Retry worker chosen by route / redirect worker if it is in + error state before sending "Service Temporarily Unavailable". + PR 38962. + - Extract stickysession routing information contained as + parameter in the URL correctly. PR 40400. + - Set the new environment variable BALANCER_ROUTE_CHANGED if a + worker with a route different from the one supplied by the + client had been chosen or if the client supplied no routing + information for a balancer with sticky sessions. + - Add information about the route, the sticky session and the + worker used during a request as environment variables. PR + 39806. + core: + - Fix issue which could cause piped loggers to be orphaned and + never terminate after a graceful restart. PR 40651. + - Fix address-in-use startup failure caused by corruption of the + list of listen sockets in some configurations with multiple + generic Listen directives. + - Fix NONBLOCK status of listening sockets on restart/graceful + PR 37680. + - Deal with the widespread use of apr_status_t return values as + HTTP status codes, as documented in PR#31759 (a bug shared by + the default handler, mod_cgi, mod_cgid, mod_proxy, and + probably others). PR31759. + - The full server version information is now included in the + error log at startup as well as server status reports, + irrespective of the setting of the ServerTokens directive. + ap_get_server_version() is now deprecated, and is replaced by + ap_get_server_banner() and ap_get_server_description(). + misc: + - Allow htcacheclean, httxt2dbm, and fcgistarter to link + apr/apr-util statically like the older support programs. + - Better detection and clean up of ldap connection that has been + terminated by the ldap server. PR 40878. + - rotatelogs: Improve error message for open failures. PR + 39487. + ------------------------------------------------------------------- Mon Jan 8 11:57:04 CET 2007 - mskibbe@suse.de - Apache XML Service Description Document (fate #301708) +------------------------------------------------------------------- +Thu Dec 21 10:36:14 CET 2006 - poeml@suse.de + +- add patch to add charset=utf-8 to directory listings generated by + mod_autoindex, and add a directive to allow overriding the + charset (testing, needs to be discussed with upstream) [#153557] + httpd-2.2.3-AddDirectoryIndexCharset.patch + ------------------------------------------------------------------- Wed Dec 20 15:58:35 CET 2006 - poeml@suse.de diff --git a/apache2.spec b/apache2.spec index 8197cba..8f4f0c0 100644 --- a/apache2.spec +++ b/apache2.spec @@ -1,5 +1,5 @@ # -# spec file for package apache2 (Version 2.2.3) +# spec file for package apache2 (Version 2.2.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -52,9 +52,9 @@ BuildRequires: expat-devel %define platform_string Linux/%VENDOR License: The Apache Software License Group: Productivity/Networking/Web/Servers -%define realver 2.2.3 -Version: 2.2.3 -Release: 26 +%define realver 2.2.4 +Version: 2.2.4 +Release: 1 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2 Source10: SUSE-NOTICE @@ -105,6 +105,7 @@ Patch23: httpd-2.1.9-apachectl.dif Patch65: httpd-2.0.49-log_server_status.dif Patch66: httpd-2.0.54-envvars.dif Patch67: httpd-2.2.0-apxs-a2enmod.dif +Patch68: httpd-2.2.3-AddDirectoryIndexCharset.patch URL: http://httpd.apache.org/ Icon: Apache.xpm Summary: The Apache Web Server Version 2.0 @@ -297,6 +298,7 @@ Authors: %patch65 -p1 %patch66 -p1 %patch67 -p1 +%patch68 -p1 # cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE # @@ -1013,8 +1015,128 @@ if ! test -f /.buildenv; then fi %changelog -n apache2 +* Tue Jan 09 2007 - poeml@suse.de +- upstream 2.2.4 + mod_authnz_ldap: + - Add an AuthLDAPRemoteUserAttribute directive. If set, + REMOTE_USER will be set to this attribute, rather than the + username supplied by the user. Useful for example when you + want users to log in using an email address, but need to + supply a userid instead to the backend. + mod_cache: + - From RFC3986 (section 6.2.3.) if a URI contains an authority + component and an empty path, the empty path is to be + equivalent to "/". It explicitly cites the following four URIs + as equivalents: + http://example.com + http://example.com/ + http://example.com:/ + http://example.com:80/ + - Eliminate a bogus error in the log when a filter returns + AP_FILTER_ERROR. + - Don't cache requests with a expires date in the past; + otherwise mod_cache will always try to cache the URL. This bug + might lead to numerous rename() errors on win32 if the URL was + previously cached. + mod_cgi and mod_cgid: + - Don't use apr_status_t error return from input filters as HTTP + return value from the handler. PR 31579. + mod_dbd: + - share per-request database handles across subrequests and + internal redirects + - key connection pools to virtual hosts correctly even when + ServerName is unset/unavailable + mod_deflate: + - Rework inflate output and deflate output filter to fix several + issues: Incorrect handling of flush buckets, potential memory + leaks, excessive memory usage in inflate output filter for + large compressed content. PR 39854. + mod_disk_cache: + - Make sure that only positive integers are accepted for the + CacheMaxFileSize and CacheMinFileSize parameters in the config + file. PR39380. + mod_dumpio: + - Allow mod_dumpio to log at other than DEBUG levels via the new + DumpIOLogLevel directive. + mod_echo: + - Fix precedence problem in if statement. PR 40658. + mod_ext_filter: + - Handle filter names which include capital letters. PR 40323. + mod_headers: + - Support regexp-based editing of HTTP headers. + mod_mime_magic: + - Fix precedence problem in if statement. PR 40656. + mod_mem_cache: + - Memory leak fix: Unconditionally free the buffer. + - Convert mod_mem_cache to use APR memory pool functions by + creating a root pool for object persistence across requests. + This also eliminates the need for custom serialization code. + mod_proxy: + - Don't try to use dead backend connection. PR 37770. + - Add explicit flushing feature. When Servlet container sends + AJP body message with size 0, this means that Servlet + container has asked for an explicit flush. Create flush bucket + in that case. This feature has been added to the recent Tomcat + versions without breaking the AJP protocol. + mod_proxy_ajp: + - Close connection to backend if reading of request body fails. + PR 40310. + - Added cping/cpong support for the AJP protocol. A new worker + directive ping=timeout will cause CPING packet to be send + expecting CPONG packet within defined timeout. In case the + backend is too busy this will fail instead sending the full + header. + mod_proxy_balancer: + - Workers can now be defined as part of a balancer cluster "set" + in which members of a lower-numbered set are preferred over + higher numbered ones. + - Workers can now be defined as "hot standby" which will only be + used if all other workers are unusable (eg: in error or + disabled). Also, the balancer-manager displays the election + count and I/O counts of all workers. + - Retry worker chosen by route / redirect worker if it is in + error state before sending "Service Temporarily Unavailable". + PR 38962. + - Extract stickysession routing information contained as + parameter in the URL correctly. PR 40400. + - Set the new environment variable BALANCER_ROUTE_CHANGED if a + worker with a route different from the one supplied by the + client had been chosen or if the client supplied no routing + information for a balancer with sticky sessions. + - Add information about the route, the sticky session and the + worker used during a request as environment variables. PR + 39806. + core: + - Fix issue which could cause piped loggers to be orphaned and + never terminate after a graceful restart. PR 40651. + - Fix address-in-use startup failure caused by corruption of the + list of listen sockets in some configurations with multiple + generic Listen directives. + - Fix NONBLOCK status of listening sockets on restart/graceful + PR 37680. + - Deal with the widespread use of apr_status_t return values as + HTTP status codes, as documented in PR#31759 (a bug shared by + the default handler, mod_cgi, mod_cgid, mod_proxy, and + probably others). PR31759. + - The full server version information is now included in the + error log at startup as well as server status reports, + irrespective of the setting of the ServerTokens directive. + ap_get_server_version() is now deprecated, and is replaced by + ap_get_server_banner() and ap_get_server_description(). + misc: + - Allow htcacheclean, httxt2dbm, and fcgistarter to link + apr/apr-util statically like the older support programs. + - Better detection and clean up of ldap connection that has been + terminated by the ldap server. PR 40878. + - rotatelogs: Improve error message for open failures. PR + 39487. * Mon Jan 08 2007 - mskibbe@suse.de - Apache XML Service Description Document (fate #301708) +* Thu Dec 21 2006 - poeml@suse.de +- add patch to add charset=utf-8 to directory listings generated by + mod_autoindex, and add a directive to allow overriding the + charset (testing, needs to be discussed with upstream) [#153557] + httpd-2.2.3-AddDirectoryIndexCharset.patch * Wed Dec 20 2006 - poeml@suse.de - set a proper HOME (/var/lib/apache2), otherwise the server might end up HOME=/root and some script might try to use that [#132769] diff --git a/httpd-2.2.3-AddDirectoryIndexCharset.patch b/httpd-2.2.3-AddDirectoryIndexCharset.patch new file mode 100644 index 0000000..563be1c --- /dev/null +++ b/httpd-2.2.3-AddDirectoryIndexCharset.patch @@ -0,0 +1,51 @@ +diff -uNr httpd-2.2.3.orig/modules/generators/mod_autoindex.c httpd-2.2.3/modules/generators/mod_autoindex.c +--- httpd-2.2.3.orig/modules/generators/mod_autoindex.c 2006-07-12 05:38:44.000000000 +0200 ++++ httpd-2.2.3/modules/generators/mod_autoindex.c 2006-12-21 10:32:01.478754000 +0100 +@@ -130,6 +130,7 @@ + int icon_height; + char default_keyid; + char default_direction; ++ char *fs_charset; + + apr_array_header_t *icon_list; + apr_array_header_t *alt_list; +@@ -556,6 +557,9 @@ + AP_INIT_ITERATE2("AddAltByEncoding", add_alt, BY_ENCODING, DIR_CMD_PERMS, + "alternate descriptive text followed by one or more " + "content encodings"), ++ AP_INIT_TAKE1("AddDirectoryIndexCharset", ap_set_string_slot, ++ (void *)APR_OFFSETOF(autoindex_config_rec, fs_charset), ++ DIR_CMD_PERMS, "alternative encoding of filenames, if not utf-8"), + AP_INIT_TAKE_ARGV("IndexOptions", add_opts, NULL, DIR_CMD_PERMS, + "one or more index options [+|-][]"), + AP_INIT_TAKE2("IndexOrderDefault", set_default_order, NULL, DIR_CMD_PERMS, +@@ -617,6 +621,8 @@ + : base->default_icon; + new->style_sheet = add->style_sheet ? add->style_sheet + : base->style_sheet; ++ new->fs_charset = add->fs_charset ? add->fs_charset ++ : base->fs_charset; + new->icon_height = add->icon_height ? add->icon_height : base->icon_height; + new->icon_width = add->icon_width ? add->icon_width : base->icon_width; + +@@ -1978,11 +1984,15 @@ + return HTTP_FORBIDDEN; + } + +-#if APR_HAS_UNICODE_FS +- ap_set_content_type(r, "text/html;charset=utf-8"); +-#else +- ap_set_content_type(r, "text/html"); +-#endif ++ if (autoindex_conf->fs_charset != NULL) { ++ ap_set_content_type(r, apr_pstrcat(r->pool, ++ "text/html;charset=", ++ autoindex_conf->fs_charset, ++ NULL)); ++ } else { ++ ap_set_content_type(r, "text/html;charset=utf-8"); ++ } ++ + if (autoindex_opts & TRACK_MODIFIED) { + ap_update_mtime(r, r->finfo.mtime); + ap_set_last_modified(r); diff --git a/httpd-2.2.3.tar.bz2 b/httpd-2.2.3.tar.bz2 deleted file mode 100644 index 22fb273..0000000 --- a/httpd-2.2.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd86e8221f9efb85497c46229d0f04237d4e66d293fabe98eb0745166aaf4b6c -size 4905728 diff --git a/httpd-2.2.4.tar.bz2 b/httpd-2.2.4.tar.bz2 new file mode 100644 index 0000000..0892039 --- /dev/null +++ b/httpd-2.2.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8 +size 4930375