You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Rodent of Unusual Size <co...@decus.org> on 1997/06/02 22:26:59 UTC
[PATCH] .c changes for Martin Kraemer's doc fixes
Several of the items that Martin pointed out were not actually
problems in the .html documentation, but in what mod_info lists for
the text for various directives. This addresses those - plus one
other item: CacheNegotiatedDocs doesn't take any arguments, but was
listed as taking RAW_ARGS. I changed that to NO_ARGS. If there's
an historical reason why it permits arguments but ignores them, that
should be rolled back, obviously.
Do we want to put this into 1.2? No functionality changes, just
`documentation'..
#ken :-)}
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.81
diff -c -r1.81 http_core.c
*** http_core.c 1997/05/08 13:09:24 1.81
--- http_core.c 1997/06/02 20:21:25
***************
*** 1151,1167 ****
/* 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),
--- 1151,1167 ----
/* 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),
Index: mod_auth.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth.c,v
retrieving revision 1.15
diff -c -r1.15 mod_auth.c
*** mod_auth.c 1997/04/24 10:16:54 1.15
--- mod_auth.c 1997/06/02 20:21:54
***************
*** 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,
Index: mod_auth_anon.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_auth_anon.c,v
retrieving revision 1.15
diff -c -r1.15 mod_auth_anon.c
*** mod_auth_anon.c 1997/03/19 03:12:52 1.15
--- mod_auth_anon.c 1997/06/02 20:22:20
***************
*** 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,
Index: mod_dir.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_dir.c,v
retrieving revision 1.26
diff -c -r1.26 mod_dir.c
*** mod_dir.c 1997/05/13 04:01:50 1.26
--- mod_dir.c 1997/06/02 20:22:41
***************
*** 234,246 ****
"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 }
};
--- 234,248 ----
"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 }
};
Index: mod_expires.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_expires.c,v
retrieving revision 1.7
diff -c -r1.7 mod_expires.c
*** mod_expires.c 1997/03/07 14:15:40 1.7
--- mod_expires.c 1997/06/02 20:22:57
***************
*** 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 }
Index: mod_negotiation.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v
retrieving revision 1.40
diff -c -r1.40 mod_negotiation.c
*** mod_negotiation.c 1997/04/17 02:50:20 1.40
--- mod_negotiation.c 1997/06/02 20:23:36
***************
*** 139,148 ****
}
command_rec negotiation_cmds[] = {
! { "CacheNegotiatedDocs", cache_negotiated_docs, NULL, RSRC_CONF, RAW_ARGS,
! NULL },
{ "LanguagePriority", set_language_priority, NULL, OR_FILEINFO, ITERATE,
! NULL },
{ NULL }
};
--- 139,148 ----
}
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 }
};
Re: [PATCH] .c changes for Martin Kraemer's doc fixes
Posted by Dean Gaudet <dg...@arctic.org>.
+1 on the patch, +0 on it being included in 1.2.
Dean
On Mon, 2 Jun 1997, Rodent of Unusual Size wrote:
> Several of the items that Martin pointed out were not actually
> problems in the .html documentation, but in what mod_info lists for
> the text for various directives. This addresses those - plus one
> other item: CacheNegotiatedDocs doesn't take any arguments, but was
> listed as taking RAW_ARGS. I changed that to NO_ARGS. If there's
> an historical reason why it permits arguments but ignores them, that
> should be rolled back, obviously.
>
> Do we want to put this into 1.2? No functionality changes, just
> `documentation'..
>
> #ken :-)}
>
> Index: http_core.c
> ===================================================================
> RCS file: /export/home/cvs/apache/src/http_core.c,v
> retrieving revision 1.81
> diff -c -r1.81 http_core.c
> *** http_core.c 1997/05/08 13:09:24 1.81
> --- http_core.c 1997/06/02 20:21:25
> ***************
> *** 1151,1167 ****
> /* 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),
> --- 1151,1167 ----
> /* 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),
> Index: mod_auth.c
> ===================================================================
> RCS file: /export/home/cvs/apache/src/mod_auth.c,v
> retrieving revision 1.15
> diff -c -r1.15 mod_auth.c
> *** mod_auth.c 1997/04/24 10:16:54 1.15
> --- mod_auth.c 1997/06/02 20:21:54
> ***************
> *** 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,
> Index: mod_auth_anon.c
> ===================================================================
> RCS file: /export/home/cvs/apache/src/mod_auth_anon.c,v
> retrieving revision 1.15
> diff -c -r1.15 mod_auth_anon.c
> *** mod_auth_anon.c 1997/03/19 03:12:52 1.15
> --- mod_auth_anon.c 1997/06/02 20:22:20
> ***************
> *** 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,
> Index: mod_dir.c
> ===================================================================
> RCS file: /export/home/cvs/apache/src/mod_dir.c,v
> retrieving revision 1.26
> diff -c -r1.26 mod_dir.c
> *** mod_dir.c 1997/05/13 04:01:50 1.26
> --- mod_dir.c 1997/06/02 20:22:41
> ***************
> *** 234,246 ****
> "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 }
> };
>
> --- 234,248 ----
> "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 }
> };
>
> Index: mod_expires.c
> ===================================================================
> RCS file: /export/home/cvs/apache/src/mod_expires.c,v
> retrieving revision 1.7
> diff -c -r1.7 mod_expires.c
> *** mod_expires.c 1997/03/07 14:15:40 1.7
> --- mod_expires.c 1997/06/02 20:22:57
> ***************
> *** 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 }
> Index: mod_negotiation.c
> ===================================================================
> RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v
> retrieving revision 1.40
> diff -c -r1.40 mod_negotiation.c
> *** mod_negotiation.c 1997/04/17 02:50:20 1.40
> --- mod_negotiation.c 1997/06/02 20:23:36
> ***************
> *** 139,148 ****
> }
>
> command_rec negotiation_cmds[] = {
> ! { "CacheNegotiatedDocs", cache_negotiated_docs, NULL, RSRC_CONF, RAW_ARGS,
> ! NULL },
> { "LanguagePriority", set_language_priority, NULL, OR_FILEINFO, ITERATE,
> ! NULL },
> { NULL }
> };
>
> --- 139,148 ----
> }
>
> 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 }
> };
>
>