You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by "Ralf S. Engelschall" <rs...@apache.org> on 1998/03/12 14:37:52 UTC
cvs commit: apache-1.3/src/modules/standard mod_mime.c
rse 98/03/12 05:37:52
Modified: src/modules/standard mod_mime.c
Log:
Just a few cosmetics while I'm poking around in this modules
to find a better solution to our mime_find_cf() cross-call
problem with mod_proxy...
Revision Changes Path
1.34 +11 -9 apache-1.3/src/modules/standard/mod_mime.c
Index: mod_mime.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_mime.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mod_mime.c 1998/03/12 11:13:25 1.33
+++ mod_mime.c 1998/03/12 13:37:51 1.34
@@ -114,7 +114,8 @@
return new;
}
-static const char *add_type(cmd_parms *cmd, mime_dir_config * m, char *ct, char *ext)
+static const char *add_type(cmd_parms *cmd, mime_dir_config * m, char *ct,
+ char *ext)
{
if (*ext == '.')
++ext;
@@ -173,10 +174,12 @@
"a language (e.g., fr), followed by one or more file extensions"},
{"AddHandler", add_handler, NULL, OR_FILEINFO, ITERATE2,
"a handler name followed by one or more file extensions"},
- {"ForceType", set_string_slot_lower, (void *) XtOffsetOf(mime_dir_config, type),
- OR_FILEINFO, TAKE1, "a media type"},
- {"SetHandler", set_string_slot_lower, (void *) XtOffsetOf(mime_dir_config, handler),
- OR_FILEINFO, TAKE1, "a handler name"},
+ {"ForceType", set_string_slot_lower,
+ (void *)XtOffsetOf(mime_dir_config, type), OR_FILEINFO, TAKE1,
+ "a media type"},
+ {"SetHandler", set_string_slot_lower,
+ (void *)XtOffsetOf(mime_dir_config, handler), OR_FILEINFO, TAKE1,
+ "a handler name"},
{"TypesConfig", set_types_config, NULL, RSRC_CONF, TAKE1,
"the MIME types config file"},
{NULL}
@@ -248,7 +251,6 @@
}
/* TM -- FIXME
-
* if r->filename does not contain a '/', the following passes a null
* pointer to getword, causing a SEGV ..
*/
@@ -332,11 +334,11 @@
{
STANDARD_MODULE_STUFF,
init_mime, /* initializer */
- create_mime_dir_config,
- merge_mime_dir_configs,
+ create_mime_dir_config, /* dir config creator */
+ merge_mime_dir_configs, /* dir config merger */
NULL, /* server config */
NULL, /* merge server config */
- mime_cmds,
+ mime_cmds, /* command table */
NULL, /* handlers */
NULL, /* filename translation */
NULL, /* check_user_id */