coar 97/06/16 17:09:17
Modified: src http_core.c mod_auth.c mod_auth_anon.c mod_dir.c
mod_expires.c mod_negotiation.c
Log:
Adding directive documentation to some directive declarations..
Submitted by: Martin Kraemer
Revision Changes Path
1.84 +6 -6 apache/src/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -C3 -r1.83 -r1.84
*** http_core.c 1997/06/15 19:22:25 1.83
--- http_core.c 1997/06/17 00:09:13 1.84
***************
*** 1165,1181 ****
/* Old access config file commands */
{ "<Directory", dirsection, NULL, RSRC_CONF, RAW_ARGS, "Container for
directives affecting resources located in the specified directories" },
! { "</Directory>", end_dirsection, NULL, ACCESS_CONF, NO_ARGS, NULL },
{ "<Location", urlsection, NULL, RSRC_CONF, RAW_ARGS, "Container for
directives affecting resources accessed through the specified URL paths" },
! { "</Location>", end_urlsection, NULL, ACCESS_CONF, NO_ARGS, NULL },
{ "<VirtualHost", virtualhost_section, NULL, RSRC_CONF, RAW_ARGS,
"Container to map directives to a particular virtual host" },
! { "</VirtualHost>", end_virtualhost_section, NULL, RSRC_CONF, NO_ARGS, NULL
},
{ "<Files", filesection, NULL, OR_ALL, RAW_ARGS, "Container for directives
affecting files matching specified patterns" },
! { "</Files>", end_filesection, NULL, OR_ALL, NO_ARGS, NULL },
{ "<Limit", limit, NULL, OR_ALL, RAW_ARGS, "Container for authentication
directives when accessed using specified HTTP methods" },
! { "</Limit>", endlimit, NULL, OR_ALL, RAW_ARGS, NULL },
{ "<IfModule", start_ifmod, NULL, OR_ALL, RAW_ARGS, "Container for
directives based on existance of specified modules" },
! { "</IfModule>", end_ifmod, NULL, OR_ALL, NO_ARGS, NULL },
{ "AuthType", set_string_slot, (void*)XtOffsetOf(core_dir_config,
auth_type),
OR_AUTHCFG, TAKE1, "An HTTP authorization type (e.g., \"Basic\")" },
{ "AuthName", set_string_slot, (void*)XtOffsetOf(core_dir_config,
auth_name),
--- 1165,1181 ----
/* Old access config file commands */
{ "<Directory", dirsection, NULL, RSRC_CONF, RAW_ARGS, "Container for
directives affecting resources located in the specified directories" },
! { "</Directory>", end_dirsection, NULL, ACCESS_CONF, NO_ARGS, "Marks end of
<Directory>" },
{ "<Location", urlsection, NULL, RSRC_CONF, RAW_ARGS, "Container for
directives affecting resources accessed through the specified URL paths" },
! { "</Location>", end_urlsection, NULL, ACCESS_CONF, NO_ARGS, "Marks end of
<Location>" },
{ "<VirtualHost", virtualhost_section, NULL, RSRC_CONF, RAW_ARGS,
"Container to map directives to a particular virtual host" },
! { "</VirtualHost>", end_virtualhost_section, NULL, RSRC_CONF, NO_ARGS,
"Marks end of <Directory>" },
{ "<Files", filesection, NULL, OR_ALL, RAW_ARGS, "Container for directives
affecting files matching specified patterns" },
! { "</Files>", end_filesection, NULL, OR_ALL, NO_ARGS, "Marks end of
<Files>" },
{ "<Limit", limit, NULL, OR_ALL, RAW_ARGS, "Container for authentication
directives when accessed using specified HTTP methods" },
! { "</Limit>", endlimit, NULL, OR_ALL, RAW_ARGS, "Marks end of <Limit>" },
{ "<IfModule", start_ifmod, NULL, OR_ALL, RAW_ARGS, "Container for
directives based on existance of specified modules" },
! { "</IfModule>", end_ifmod, NULL, OR_ALL, NO_ARGS, "Marks end of
<IfModule>" },
{ "AuthType", set_string_slot, (void*)XtOffsetOf(core_dir_config,
auth_type),
OR_AUTHCFG, TAKE1, "An HTTP authorization type (e.g., \"Basic\")" },
{ "AuthName", set_string_slot, (void*)XtOffsetOf(core_dir_config,
auth_name),
1.16 +4 -2 apache/src/mod_auth.c
Index: mod_auth.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C3 -r1.15 -r1.16
*** mod_auth.c 1997/04/24 10:16:54 1.15
--- mod_auth.c 1997/06/17 00:09:13 1.16
***************
*** 99,107 ****
command_rec auth_cmds[] = {
{ "AuthUserFile", set_auth_slot,
! (void*)XtOffsetOf(auth_config_rec,auth_pwfile), OR_AUTHCFG, TAKE12, NULL
},
{ "AuthGroupFile", set_auth_slot,
! (void*)XtOffsetOf(auth_config_rec,auth_grpfile), OR_AUTHCFG, TAKE12, NULL
},
{ "AuthAuthoritative", set_flag_slot,
(void*)XtOffsetOf(auth_config_rec,auth_authoritative),
OR_AUTHCFG, FLAG,
--- 99,109 ----
command_rec auth_cmds[] = {
{ "AuthUserFile", set_auth_slot,
! (void*)XtOffsetOf(auth_config_rec,auth_pwfile), OR_AUTHCFG, TAKE12,
! "text file containing user IDs and passwords" },
{ "AuthGroupFile", set_auth_slot,
! (void*)XtOffsetOf(auth_config_rec,auth_grpfile), OR_AUTHCFG, TAKE12,
! "text file containing group names and member user IDs" },
{ "AuthAuthoritative", set_flag_slot,
(void*)XtOffsetOf(auth_config_rec,auth_authoritative),
OR_AUTHCFG, FLAG,
1.16 +2 -2 apache/src/mod_auth_anon.c
Index: mod_auth_anon.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth_anon.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C3 -r1.15 -r1.16
*** mod_auth_anon.c 1997/03/19 03:12:52 1.15
--- mod_auth_anon.c 1997/06/17 00:09:13 1.16
***************
*** 178,185 ****
}
command_rec anon_auth_cmds[] = {
! { "Anonymous", anon_set_string_slots,
! NULL,OR_AUTHCFG, ITERATE, NULL },
{ "Anonymous_MustGiveEmail", anon_set_passwd_flag, NULL, OR_AUTHCFG, FLAG,
"Limited to 'on' or 'off'" },
{ "Anonymous_NoUserId", anon_set_userid_flag, NULL, OR_AUTHCFG, FLAG,
--- 178,185 ----
}
command_rec anon_auth_cmds[] = {
! { "Anonymous", anon_set_string_slots, NULL,OR_AUTHCFG, ITERATE,
! "a space-separated list of user IDs" },
{ "Anonymous_MustGiveEmail", anon_set_passwd_flag, NULL, OR_AUTHCFG, FLAG,
"Limited to 'on' or 'off'" },
{ "Anonymous_NoUserId", anon_set_userid_flag, NULL, OR_AUTHCFG, FLAG,
1.28 +4 -2 apache/src/mod_dir.c
Index: mod_dir.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_dir.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C3 -r1.27 -r1.28
*** mod_dir.c 1997/06/15 19:22:29 1.27
--- mod_dir.c 1997/06/17 00:09:14 1.28
***************
*** 238,250 ****
"Descriptive text followed by one or more filenames" },
{ "HeaderName", add_header, NULL, DIR_CMD_PERMS, TAKE1, "a filename" },
{ "ReadmeName", add_readme, NULL, DIR_CMD_PERMS, TAKE1, "a filename" },
! { "FancyIndexing", fancy_indexing, NULL, DIR_CMD_PERMS, FLAG, NULL },
{ "DefaultIcon", set_string_slot,
(void*)XtOffsetOf(dir_config_rec, default_icon),
DIR_CMD_PERMS, TAKE1, "an icon URL"},
{ "DirectoryIndex", set_string_slot,
(void*)XtOffsetOf(dir_config_rec, index_names),
! DIR_CMD_PERMS, RAW_ARGS, NULL },
{ NULL }
};
--- 238,252 ----
"Descriptive text followed by one or more filenames" },
{ "HeaderName", add_header, NULL, DIR_CMD_PERMS, TAKE1, "a filename" },
{ "ReadmeName", add_readme, NULL, DIR_CMD_PERMS, TAKE1, "a filename" },
! { "FancyIndexing", fancy_indexing, NULL, DIR_CMD_PERMS, FLAG,
! "Limited to 'on' or 'off' (superseded by IndexOptions FancyIndexing)" },
{ "DefaultIcon", set_string_slot,
(void*)XtOffsetOf(dir_config_rec, default_icon),
DIR_CMD_PERMS, TAKE1, "an icon URL"},
{ "DirectoryIndex", set_string_slot,
(void*)XtOffsetOf(dir_config_rec, index_names),
! DIR_CMD_PERMS, RAW_ARGS,
! "a list of file names" },
{ NULL }
};
1.8 +3 -2 apache/src/mod_expires.c
Index: mod_expires.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_expires.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C3 -r1.7 -r1.8
*** mod_expires.c 1997/03/07 14:15:40 1.7
--- mod_expires.c 1997/06/17 00:09:14 1.8
***************
*** 352,360 ****
}
command_rec expires_cmds[] = {
! { "ExpiresActive", set_expiresactive, NULL, DIR_CMD_PERMS, FLAG, NULL},
{ "ExpiresBytype", set_expiresbytype, NULL, DIR_CMD_PERMS, TAKE2,
! "a mime type followed by an expiry date code"},
{ "ExpiresDefault", set_expiresdefault, NULL, DIR_CMD_PERMS, TAKE1,
"an expiry date code"},
{ NULL }
--- 352,361 ----
}
command_rec expires_cmds[] = {
! { "ExpiresActive", set_expiresactive, NULL, DIR_CMD_PERMS, FLAG,
! "Limited to 'on' or 'off'"},
{ "ExpiresBytype", set_expiresbytype, NULL, DIR_CMD_PERMS, TAKE2,
! "a MIME type followed by an expiry date code"},
{ "ExpiresDefault", set_expiresdefault, NULL, DIR_CMD_PERMS, TAKE1,
"an expiry date code"},
{ NULL }
1.42 +3 -3 apache/src/mod_negotiation.c
Index: mod_negotiation.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C3 -r1.41 -r1.42
*** mod_negotiation.c 1997/06/15 19:22:31 1.41
--- mod_negotiation.c 1997/06/17 00:09:14 1.42
***************
*** 142,151 ****
}
command_rec negotiation_cmds[] = {
! { "CacheNegotiatedDocs", cache_negotiated_docs, NULL, RSRC_CONF, RAW_ARGS,
! NULL },
{ "LanguagePriority", set_language_priority, NULL, OR_FILEINFO, ITERATE,
! NULL },
{ NULL }
};
--- 142,151 ----
}
command_rec negotiation_cmds[] = {
! { "CacheNegotiatedDocs", cache_negotiated_docs, NULL, RSRC_CONF, NO_ARGS,
! "no arguments (either present or absent)" },
{ "LanguagePriority", set_language_priority, NULL, OR_FILEINFO, ITERATE,
! "space-delimited list of MIME language abbreviations" },
{ NULL }
};
