Hello community, here is the log from the commit of package apache2 checked in at Fri Aug 31 15:36:18 CEST 2007. -------- --- apache2/apache2.changes 2007-08-23 12:11:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/apache2/apache2.changes 2007-08-31 12:38:21.000000000 +0200 @@ -1,0 +2,23 @@ +Fri Aug 31 12:37:27 CEST 2007 - poeml@suse.de + +- replace httpd-2.2.3-AddDirectoryIndexCharset.patch with the upstream + solution, httpd-2.2.4-mod_autoindex-charset-r570962.patch [#153557] + (backport from 2.2.6) + * Merge r570532, r570535, r570558 from trunk: + IndexOptions ContentType=text/html Charset=UTF-8 magic. + http://svn.apache.org/viewvc?rev=570962&view=rev + http://issues.apache.org/bugzilla/show_bug.cgi?id=42105 + This means that the AddDirectoryIndexCharset is no longer + available. Instead, IndexOptions Charset=xyz can be used. + +------------------------------------------------------------------- +Fri Aug 31 11:42:58 CEST 2007 - poeml@suse.de + +- remove libexpat-devel in the build service version of the package +- apply apache2-mod_cache-CVE-2007-1863.patch (patch 152) in the + buildservice package +- don't apply mod_dbd.c-issue18989-autoconnect.dif, since it + patches only modules/database/mod_dbd.c which is replaced with + trunk version anyway + +------------------------------------------------------------------- Old: ---- httpd-2.2.3-AddDirectoryIndexCharset.patch New: ---- httpd-2.2.4-mod_autoindex-charset-r570962.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2.spec ++++++ --- /var/tmp/diff_new_pack.ub7793/_old 2007-08-31 15:31:35.000000000 +0200 +++ /var/tmp/diff_new_pack.ub7793/_new 2007-08-31 15:31:35.000000000 +0200 @@ -55,7 +55,7 @@ Group: Productivity/Networking/Web/Servers %define realver 2.2.4 Version: 2.2.4 -Release: 57 +Release: 59 #Source0: http://www.apache.org/dist/httpd-%{version}.tar.bz2 Source0: http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2 Source10: SUSE-NOTICE @@ -107,7 +107,7 @@ 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 +Patch68: httpd-2.2.4-mod_autoindex-charset-r570962.patch Patch69: httpd-2.2.x.doublefree.patch Patch150: mod_dbd.c-issue18989-autoconnect.dif Patch151: apache2-mod_status-CVE-2006-5752.patch @@ -321,7 +321,7 @@ %patch65 -p1 %patch66 -p1 %patch67 -p1 -%patch68 -p1 +%patch68 -p0 %patch69 -p0 %patch151 -p0 %patch152 -p0 @@ -1060,6 +1060,23 @@ fi %changelog +* Fri Aug 31 2007 - poeml@suse.de +- replace httpd-2.2.3-AddDirectoryIndexCharset.patch with the upstream + solution, httpd-2.2.4-mod_autoindex-charset-r570962.patch [#153557] + (backport from 2.2.6) + * Merge r570532, r570535, r570558 from trunk: + IndexOptions ContentType=text/html Charset=UTF-8 magic. + http://svn.apache.org/viewvc?rev=570962&view=rev + http://issues.apache.org/bugzilla/show_bug.cgi?id=42105 + This means that the AddDirectoryIndexCharset is no longer + available. Instead, IndexOptions Charset=xyz can be used. +* Fri Aug 31 2007 - poeml@suse.de +- remove libexpat-devel in the build service version of the package +- apply apache2-mod_cache-CVE-2007-1863.patch (patch 152) in the + buildservice package +- don't apply mod_dbd.c-issue18989-autoconnect.dif, since it + patches only modules/database/mod_dbd.c which is replaced with + trunk version anyway * Thu Aug 23 2007 - mskibbe@suse.de - Bug 289996 - VUL-0: mod_status XSS in public server status page - Bug 289997 - VUL-0: apache2: mod_cache remote denial of service ++++++ httpd-2.2.4-mod_autoindex-charset-r570962.patch ++++++ Index: modules/generators/mod_autoindex.c =================================================================== --- modules/generators/mod_autoindex.c (revision 570961) +++ modules/generators/mod_autoindex.c (revision 570962) @@ -138,6 +138,8 @@ apr_array_header_t *hdr_list; apr_array_header_t *rdme_list; + char *ctype; + char *charset; } autoindex_config_rec; static char c_by_encoding, c_by_type, c_by_path; @@ -476,6 +478,12 @@ d_cfg->desc_adjust = K_NOADJUST; } } + else if (!strncasecmp(w, "Type=", 5)) { + d_cfg->ctype = apr_pstrdup(cmd->pool, &w[5]); + } + else if (!strncasecmp(w, "Charset=", 8)) { + d_cfg->charset = apr_pstrdup(cmd->pool, &w[8]); + } else { return "Invalid directory indexing option"; } @@ -620,6 +628,9 @@ new->icon_height = add->icon_height ? add->icon_height : base->icon_height; new->icon_width = add->icon_width ? add->icon_width : base->icon_width; + new->ctype = add->ctype ? add->ctype : base->ctype; + new->charset = add->charset ? add->charset : base->charset; + new->alt_list = apr_array_append(p, add->alt_list, base->alt_list); new->ign_list = apr_array_append(p, add->ign_list, base->ign_list); new->hdr_list = apr_array_append(p, add->hdr_list, base->hdr_list); @@ -1971,6 +1982,8 @@ char *colargs; char *fullpath; apr_size_t dirpathlen; + char *ctype = "text/html"; + char *charset; if ((status = apr_dir_open(&thedir, name, r->pool)) != APR_SUCCESS) { ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, @@ -1978,11 +1991,27 @@ return HTTP_FORBIDDEN; } + if (autoindex_conf->ctype) { + ctype = autoindex_conf->ctype; + } + if (autoindex_conf->charset) { + charset = autoindex_conf->charset; + } + else { #if APR_HAS_UNICODE_FS - ap_set_content_type(r, "text/html;charset=utf-8"); + charset = "UTF-8"; #else - ap_set_content_type(r, "text/html"); + charset = "ISO-8859-1"; #endif + } + if (*charset) { + ap_set_content_type(r, apr_pstrcat(r->pool, ctype, ";charset=", + charset, NULL)); + } + else { + ap_set_content_type(r, ctype); + } + if (autoindex_opts & TRACK_MODIFIED) { ap_update_mtime(r, r->finfo.mtime); ap_set_last_modified(r); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de