rbb 99/12/31 09:06:16
Modified:src/modules/standard mod_digest.c mod_vhost_alias.c
Log:
Update these modules to Apache 2.0. Not tested, but they compile again.
Revision ChangesPath
1.6 +2 -2 apache-2.0/src/modules/standard/mod_digest.c
Index: mod_digest.c
===
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_digest.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_digest.c 1999/10/22 16:01:25 1.5
+++ mod_digest.c 1999/12/31 17:06:15 1.6
@@ -111,7 +111,7 @@
const char *rpw;
char *w, *x;
-if (!(f = ap_pcfg_openfile(r-pool, auth_pwfile))) {
+if (ap_pcfg_openfile(f, r-pool, auth_pwfile) != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, errno, r,
Could not open password file: %s, auth_pwfile);
return NULL;
@@ -161,7 +161,7 @@
if (strcasecmp(scheme = ap_getword_white(r-pool, auth_line),
Digest)) {
/* Client tried to authenticate using wrong auth scheme */
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r-server,
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, errno, r-server,
client used wrong authentication scheme: %s for %s,
scheme, r-uri);
ap_note_digest_auth_failure(r);
1.3 +7 -13 apache-2.0/src/modules/standard/mod_vhost_alias.c
Index: mod_vhost_alias.c
===
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_vhost_alias.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mod_vhost_alias.c 1999/08/31 05:34:06 1.2
+++ mod_vhost_alias.c 1999/12/31 17:06:15 1.3
@@ -457,26 +457,20 @@
return OK;
}
+static void register_hooks(void)
+{
+ap_hook_translate_name(mva_translate, NULL, NULL, HOOK_MIDDLE);
+};
module MODULE_VAR_EXPORT vhost_alias_module =
{
-STANDARD_MODULE_STUFF,
-NULL,/* initializer */
+STANDARD20_MODULE_STUFF,
NULL,/* dir config creater */
NULL,/* dir merger --- default is to override */
mva_create_server_config,/* server config */
mva_merge_server_config, /* merge server configs */
mva_commands,/* command ap_table_t */
NULL,/* handlers */
-mva_translate, /* filename translation */
-NULL,/* check_user_id */
-NULL,/* check auth */
-NULL,/* check access */
-NULL,/* type_checker */
-NULL,/* fixups */
-NULL,/* logger */
-NULL,/* header parser */
-NULL,/* child_init */
-NULL,/* child_exit */
-NULL /* post read-request */
+register_hooks /* register hooks */
};
+