Mailing List Archive

randy 97/08/31 19:39:06

Modified: src/modules/standard mod_rewrite.c
Log:
Convert log_*() to aplog_error().

Revision Changes Path
1.50 +13 -6 apachen/src/modules/standard/mod_rewrite.c

Index: mod_rewrite.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mod_rewrite.c 1997/08/31 16:43:15 1.49
+++ mod_rewrite.c 1997/09/01 02:39:03 1.50
@@ -935,8 +935,9 @@
/* check if the proxy module is enabled, so
we can actually use it! */
if (!proxy_available) {
- log_reason("attempt to make remote request from mod_rewrite "
- "without proxy enabled", r->filename, r);
+ aplog_error(APLOG_MARK, APLOG_ERR, r->server,
+ "attempt to make remote request from mod_rewrite "
+ "without proxy enabled", r->filename);
return FORBIDDEN;
}

@@ -1144,7 +1145,10 @@
*/
if (!(allow_options(r) & (OPT_SYM_LINKS | OPT_SYM_OWNER))) {
/* FollowSymLinks is mandatory! */
- log_reason("Options FollowSymLinks or SymLinksIfOwnerMatch is off which implies that RewriteRule directive is forbidden", r->filename, r);
+ aplog_error(APLOG_MARK, APLOG_ERR, r->server,
+ "Options FollowSymLinks or SymLinksIfOwnerMatch is off "
+ "which implies that RewriteRule directive is forbidden: %s",
+ r->filename);
return FORBIDDEN;
}
else {
@@ -2115,7 +2119,8 @@
if (cpT != NULL) {
n = strlen(cpT);
if (cpO + n >= newuri + sizeof(newuri)) {
- log_printf(r->server, "insufficient space in expand_map_lookups, aborting");
+ aplog_error(APLOG_MARK, APLOG_ERR, r->server,
+ "insufficient space in expand_map_lookups, aborting");
return;
}
memcpy(cpO, cpT, n);
@@ -2124,7 +2129,8 @@
else {
n = strlen(defaultvalue);
if (cpO + n >= newuri + sizeof(newuri)) {
- log_printf(r->server, "insufficient space in expand_map_lookups, aborting");
+ aplog_error(APLOG_MARK, APLOG_ERR, r->server,
+ "insufficient space in expand_map_lookups, aborting");
return;
}
memcpy(cpO, defaultvalue, n);
@@ -2137,7 +2143,8 @@
cpT = cpI+strlen(cpI);
n = cpT-cpI;
if (cpO + n >= newuri + sizeof(newuri)) {
- log_printf(r->server, "insufficient space in expand_map_lookups, aborting");
+ aplog_error(APLOG_MARK, APLOG_ERR, r->server,
+ "insufficient space in expand_map_lookups, aborting");
return;
}
memcpy(cpO, cpI, n);