You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2007/08/30 00:37:27 UTC
svn commit: r570962 - in /httpd/httpd/branches/2.2.x: CHANGES
docs/manual/mod/mod_autoindex.xml modules/generators/mod_autoindex.c
Author: jim
Date: Wed Aug 29 15:37:26 2007
New Revision: 570962
URL: http://svn.apache.org/viewvc?rev=570962&view=rev
Log:
Merge r570532, r570535, r570558 from trunk:
IndexOptions ContentType=text/html Charset=UTF-8
magic.
Document new IndexOptions options
Make Bill happy ;)
Submitted by: jim
Reviewed by: root
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml
httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=570962&r1=570961&r2=570962&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Aug 29 15:37:26 2007
@@ -1,6 +1,11 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.6
+ *) mod_autoindex: Add in Type and Charset options to IndexOptions
+ directive. This allows the admin to explicitly set the
+ content-type and charset of the generated page.
+ [Jim Jagielski]
+
*) log core: ensure we use a special pool for stderr logging, so that
the stderr channel remains valid from the time plog is destroyed,
until the time the open_logs hook is called again. [William Rowe]
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml?rev=570962&r1=570961&r2=570962&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_autoindex.xml Wed Aug 29 15:37:26 2007
@@ -525,6 +525,36 @@
of</p>
<dl>
+ <dt><a name="indexoptions.charset"
+ id="indexoptions.charset"
+ >Charset=<var>character-set</var></a> (<em>Apache 2.0.61 and
+ later</em>)</dt>
+
+ <dd>The <code>Charset</code> keyword allows you to
+ specify the character set of the generated page. The
+ default is either <var>ISO-8859-1</var> or <var>UTF-8</var>,
+ depending on whether the underlying file system is unicode
+ or not.
+
+ <example><title>Example:</title>
+ IndexOptions Charset=UTF-8
+ </example>
+ </dd>
+
+ <dt><a name="indexoptions.type"
+ id="indexoptions.type"
+ >Type=<var>MIME content-type</var></a> (<em>Apache 2.0.61 and
+ later</em>)</dt>
+
+ <dd>The <code>Type</code> keyword allows you to
+ specify the MIME content-type of the generated page. The default
+ is <var>text/html</var>.
+
+ <example><title>Example:</title>
+ IndexOptions Type=text/plain
+ </example>
+ </dd>
+
<dt><a name="indexoptions.descriptionwidth"
id="indexoptions.descriptionwidth"
>DescriptionWidth=[<var>n</var> | *]</a> (<em>Apache 2.0.23 and
Modified: httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c?rev=570962&r1=570961&r2=570962&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c (original)
+++ httpd/httpd/branches/2.2.x/modules/generators/mod_autoindex.c Wed Aug 29 15:37:26 2007
@@ -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);