You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rs...@hyperreal.org on 2000/02/05 13:33:17 UTC
cvs commit: apache-1.3/src/modules/standard mod_auth.c mod_status.c mod_cern_meta.c
rse 00/02/05 04:33:17
Modified: src CHANGES
src/modules/standard mod_auth.c mod_status.c mod_cern_meta.c
Log:
Make implementation/descriptions of the FLAG directives
AuthAuthoritative, MetaFiles and ExtendedStatus consistent with
documentation and the standard way of implementation those directives.
Submitted by: David MacKenzie <dj...@web.us.uu.net>, Ralf S. Engelschall
Reviewed by: Ralf S. Engelschall
PR: 5642
Revision Changes Path
1.1509 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1508
retrieving revision 1.1509
diff -u -r1.1508 -r1.1509
--- CHANGES 2000/02/05 12:01:48 1.1508
+++ CHANGES 2000/02/05 12:33:13 1.1509
@@ -1,5 +1,10 @@
Changes with Apache 1.3.12
+ *) Make implementation/descriptions of the FLAG directives
+ AuthAuthoritative, MetaFiles and ExtendedStatus consistent with
+ documentation and the standard way of implementation those directives.
+ [David MacKenzie <dj...@web.us.uu.net>, Ralf S. Engelschall] PR#5642
+
*) Cast integer ap_wait_t values in http_main.c to get rid of compile
time errors on platforms where "ap_wait_t" is not defined as "int"
(currently only the NEXT and UTS21 platforms).
1.48 +1 -1 apache-1.3/src/modules/standard/mod_auth.c
Index: mod_auth.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_auth.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- mod_auth.c 1999/08/02 20:50:22 1.47
+++ mod_auth.c 2000/02/05 12:33:15 1.48
@@ -110,7 +110,7 @@
{"AuthAuthoritative", ap_set_flag_slot,
(void *) XtOffsetOf(auth_config_rec, auth_authoritative),
OR_AUTHCFG, FLAG,
- "Set to 'no' to allow access control to be passed along to lower modules if the UserID is not known to this module"},
+ "Set to 'off' to allow access control to be passed along to lower modules if the UserID is not known to this module"},
{NULL}
};
1.112 +3 -8 apache-1.3/src/modules/standard/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_status.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- mod_status.c 2000/02/02 20:44:06 1.111
+++ mod_status.c 2000/02/05 12:33:16 1.112
@@ -135,24 +135,19 @@
*command-related code. This is here to prevent use of ExtendedStatus
* without status_module included.
*/
-static const char *set_extended_status(cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_extended_status(cmd_parms *cmd, void *dummy, int arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {
return err;
}
- if (!strcasecmp(arg, "off") || !strcmp(arg, "0")) {
- ap_extended_status = 0;
- }
- else {
- ap_extended_status = 1;
- }
+ ap_extended_status = arg;
return NULL;
}
static const command_rec status_module_cmds[] =
{
- { "ExtendedStatus", set_extended_status, NULL, RSRC_CONF, TAKE1,
+ { "ExtendedStatus", set_extended_status, NULL, RSRC_CONF, FLAG,
"\"On\" to enable extended status information, \"Off\" to disable" },
{NULL}
};
1.38 +2 -2 apache-1.3/src/modules/standard/mod_cern_meta.c
Index: mod_cern_meta.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_cern_meta.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_cern_meta.c 1999/10/21 20:45:17 1.37
+++ mod_cern_meta.c 2000/02/05 12:33:16 1.38
@@ -169,7 +169,7 @@
typedef struct {
char *metadir;
char *metasuffix;
- char *metafiles;
+ int metafiles;
} cern_meta_dir_config;
static void *create_cern_meta_dir_config(pool *p, char *dummy)
@@ -210,7 +210,7 @@
return NULL;
}
-static const char *set_metafiles(cmd_parms *parms, cern_meta_dir_config * dconf, char *arg)
+static const char *set_metafiles(cmd_parms *parms, cern_meta_dir_config * dconf, int arg)
{
dconf->metafiles = arg;
return NULL;
Re: cvs commit: apache-1.3/src/modules/standard mod_auth.c mod_status.c
mod_cern_meta.c
Posted by Greg Stein <gs...@lyra.org>.
On 5 Feb 2000 rse@hyperreal.org wrote:
> rse 00/02/05 04:33:17
>
> Modified: src CHANGES
> src/modules/standard mod_auth.c mod_status.c mod_cern_meta.c
> Log:
> Make implementation/descriptions of the FLAG directives
> AuthAuthoritative, MetaFiles and ExtendedStatus consistent with
> documentation and the standard way of implementation those directives.
>...
> --- mod_status.c 2000/02/02 20:44:06 1.111
> +++ mod_status.c 2000/02/05 12:33:16 1.112
> @@ -135,24 +135,19 @@
> *command-related code. This is here to prevent use of ExtendedStatus
> * without status_module included.
> */
> -static const char *set_extended_status(cmd_parms *cmd, void *dummy, char *arg)
> +static const char *set_extended_status(cmd_parms *cmd, void *dummy, int arg)
> {
> const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
> if (err != NULL) {
> return err;
> }
> - if (!strcasecmp(arg, "off") || !strcmp(arg, "0")) {
> - ap_extended_status = 0;
> - }
> - else {
> - ap_extended_status = 1;
> - }
> + ap_extended_status = arg;
> return NULL;
> }
>
> static const command_rec status_module_cmds[] =
> {
> - { "ExtendedStatus", set_extended_status, NULL, RSRC_CONF, TAKE1,
> + { "ExtendedStatus", set_extended_status, NULL, RSRC_CONF, FLAG,
> "\"On\" to enable extended status information, \"Off\" to disable" },
> {NULL}
> };
You've changed the allowed values here(!)
ExtendedStatus used to be able to take "0". However, you changed the
directive to use a FLAG which is only "on" and "off". Hmm. Actually, it
used to be able to take anything.
While the new code conforms to the documentation, it could mess up
existing configurations that used "0" or "1" or something.
Just a yellow flag... I'm -0 on the change.
Cheers,
-g
--
Greg Stein, http://www.lyra.org/