#endif
#ifndef REWRITELOG_DISABLED
-
-#define rewritelog(x) do_rewritelog x
+#ifdef AP_HAVE_C99
+#define rewritelog(...) do_rewritelog(__LINE__, __VA_ARGS__)
+#else
+#define rewritelog do_rewritelog
+#endif
#define REWRITELOG_MODE ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD )
#define REWRITELOG_FLAGS ( APR_WRITE | APR_APPEND | APR_CREATE )
#else /* !REWRITELOG_DISABLED */
-#define rewritelog(x)
-
+#ifdef AP_HAVE_C99
+#define rewritelog(...)
+#else
+#define rewritelog do_rewritelog
+#endif
#endif /* REWRITELOG_DISABLED */
/* remembered mime-type for [T=...] */
* +-------------------------------------------------------+
*/
-#ifndef REWRITELOG_DISABLED
+/* Slightly complicated definitions follow here to support
+ * compile-time choice of enabled/disabled of rewritelog both with or
+ * without C99 support, where varargs macros are only available with
+ * C99.
+ *
+ * do_rewritelog is defined for (rewritelog enabled) or (rewritelog
+ * disabled AND no C99 support) but is an noop for the latter case and
+ * should get optimized away.
+ *
+ * For the (rewritelog disabled) case the function is defined
+ * differently for C99/non-C99. For C99, the rewritelog() macro passes
+ * __LINE__, allowing accurate logging of line numbers. For non-C99
+ * the line number used for rewritelog() tracing is always
+ * constant. */
+
+#if !defined(REWRITELOG_DISABLED) || !defined(AP_HAVE_C99)
+
+#ifdef AP_HAVE_C99
+static void do_rewritelog(int line,
+ request_rec *r, int level, char *perdir,
+ const char *fmt, ...)
+ __attribute__((format(printf,5,6)));
+#else
static void do_rewritelog(request_rec *r, int level, char *perdir,
const char *fmt, ...)
__attribute__((format(printf,4,5)));
+#endif
-static void do_rewritelog(request_rec *r, int level, char *perdir,
+static void do_rewritelog(
+#ifdef AP_HAVE_C99
+ int line,
+#endif
+ request_rec *r, int level, char *perdir,
const char *fmt, ...)
{
+#ifndef REWRITELOG_DISABLED
char *logline, *text;
const char *rhost, *rname;
int redir;
AP_REWRITE_LOG((uintptr_t)r, level, r->main ? 0 : 1, (char *)ap_get_server_name(r), logline);
/* Intentional no APLOGNO */
+#ifdef AP_HAVE_C99
+ ap_log_rerror(__FILE__, line, APLOG_MODULE_INDEX, APLOG_DEBUG + level, 0, r, "%s", logline);
+#else
ap_log_rerror(APLOG_MARK, APLOG_DEBUG + level, 0, r, "%s", logline);
-
- return;
-}
+#endif
+
#endif /* !REWRITELOG_DISABLED */
+}
+#endif /* !defined(REWRITELOG_DISABLED) || !defined(AP_HAVE_C99) */
/*
int qslast = flags & RULEFLAG_QSLAST;
if (flags & RULEFLAG_QSNONE) {
- rewritelog((r, 2, NULL, "discarding query string, no parse from substitution"));
+ rewritelog(r, 2, NULL, "discarding query string, no parse from substitution");
r->args = NULL;
return;
}
if (qsdiscard) {
r->args = NULL; /* Discard query string */
- rewritelog((r, 2, NULL, "discarding query string"));
+ rewritelog(r, 2, NULL, "discarding query string");
}
q = qslast ? ap_strrchr(r->filename + skip, '?') : ap_strchr(r->filename + skip, '?');
}
}
- rewritelog((r, 3, NULL, "split uri=%s -> uri=%s, args=%s", olduri,
- r->filename, r->args ? r->args : "<none>"));
+ rewritelog(r, 3, NULL, "split uri=%s -> uri=%s, args=%s", olduri,
+ r->filename, r->args ? r->args : "<none>");
}
}
if (ap_matches_request_vhost(r, host, port)) {
rewrite_server_conf *conf =
ap_get_module_config(r->server->module_config, &rewrite_module);
- rewritelog((r, 3, NULL, "reduce %s -> %s", r->filename, url));
+ rewritelog(r, 3, NULL, "reduce %s -> %s", r->filename, url);
r->filename = apr_pstrdup(r->pool, url);
/* remember that the uri was reduced */
static int startsWith(request_rec *r, const char *haystack, const char *needle) {
int rc = (ap_strstr_c(haystack, needle) == haystack);
- rewritelog((r, 5, NULL, "prefix_stat startsWith(%s, %s) %d", haystack, needle, rc));
+ rewritelog(r, 5, NULL, "prefix_stat startsWith(%s, %s) %d", haystack, needle, rc);
return rc;
}
/*
if (apr_stat(&sb, statpath, APR_FINFO_MIN, pool) == APR_SUCCESS) {
if (!lastsub) {
- rewritelog((r, 3, NULL, "prefix_stat no lastsub subst prefix %s", statpath));
+ rewritelog(r, 3, NULL, "prefix_stat no lastsub subst prefix %s", statpath);
return 1;
}
- rewritelog((r, 3, NULL, "prefix_stat compare statpath %s and lastsub output %s STATOK %d ",
- statpath, lastsub->output, lastsub->flags & RULEFLAG_UNSAFE_PREFIX_STAT));
+ rewritelog(r, 3, NULL, "prefix_stat compare statpath %s and lastsub output %s STATOK %d ",
+ statpath, lastsub->output, lastsub->flags & RULEFLAG_UNSAFE_PREFIX_STAT);
if (lastsub->flags & RULEFLAG_UNSAFE_PREFIX_STAT) {
return 1;
}
apr_size_t slen, outlen;
char *output;
- rewritelog((r, 5, NULL, "strip matching prefix: %s -> %s", input,
- input+len));
+ rewritelog(r, 5, NULL, "strip matching prefix: %s -> %s", input,
+ input+len);
slen = strlen(subst);
if (slen && subst[slen - 1] != '/') {
memcpy(output+slen, input+len, outlen - slen);
output[outlen] = '\0';
- rewritelog((r, 4, NULL, "add subst prefix: %s -> %s", input+len,
- output));
+ rewritelog(r, 4, NULL, "add subst prefix: %s -> %s", input+len,
+ output);
return output;
}
return ret;
default:
/* what's a fair rewritelog level for this? */
- rewritelog((r, 3, NULL, "Multiple values found for %s", key));
+ rewritelog(r, 3, NULL, "Multiple values found for %s", key);
return ret;
}
}
value = get_cache_value(s->cachename, st.mtime, key, r->pool);
if (!value) {
- rewritelog((r, 6, NULL,
- "cache lookup FAILED, forcing new map lookup"));
-
+ rewritelog(r, 6, NULL,
+ "cache lookup FAILED, forcing new map lookup");
+
value = lookup_map_txtfile(r, s->datafile, key);
if (!value) {
- rewritelog((r, 5, NULL, "map lookup FAILED: map=%s[txt] key=%s",
- name, key));
+ rewritelog(r, 5, NULL, "map lookup FAILED: map=%s[txt] key=%s",
+ name, key);
set_cache_value(s->cachename, st.mtime, key, "");
return NULL;
}
- rewritelog((r, 5, NULL,"map lookup OK: map=%s[txt] key=%s -> val=%s",
- name, key, value));
+ rewritelog(r, 5, NULL, "map lookup OK: map=%s[txt] key=%s -> val=%s",
+ name, key, value);
set_cache_value(s->cachename, st.mtime, key, value);
}
else {
- rewritelog((r,5,NULL,"cache lookup OK: map=%s[txt] key=%s -> val=%s",
- name, key, value));
+ rewritelog(r, 5, NULL, "cache lookup OK: map=%s[txt] key=%s -> val=%s",
+ name, key, value);
}
if (s->type == MAPTYPE_RND && *value) {
value = select_random_value_part(r, value);
- rewritelog((r, 5, NULL, "randomly chosen the subvalue `%s'",value));
+ rewritelog(r, 5, NULL, "randomly chosen the subvalue `%s'",value);
}
return *value ? value : NULL;
value = get_cache_value(s->cachename, st.mtime, key, r->pool);
if (!value) {
- rewritelog((r, 6, NULL,
- "cache lookup FAILED, forcing new map lookup"));
+ rewritelog(r, 6, NULL,
+ "cache lookup FAILED, forcing new map lookup");
value = lookup_map_dbmfile(r, s->datafile, s->dbmtype, key);
if (!value) {
- rewritelog((r, 5, NULL, "map lookup FAILED: map=%s[dbm] key=%s",
- name, key));
+ rewritelog(r, 5, NULL, "map lookup FAILED: map=%s[dbm] key=%s",
+ name, key);
set_cache_value(s->cachename, st.mtime, key, "");
return NULL;
}
- rewritelog((r, 5, NULL, "map lookup OK: map=%s[dbm] key=%s -> "
- "val=%s", name, key, value));
+ rewritelog(r, 5, NULL, "map lookup OK: map=%s[dbm] key=%s -> "
+ "val=%s", name, key, value);
set_cache_value(s->cachename, st.mtime, key, value);
return value;
}
- rewritelog((r, 5, NULL, "cache lookup OK: map=%s[dbm] key=%s -> val=%s",
- name, key, value));
+ rewritelog(r, 5, NULL, "cache lookup OK: map=%s[dbm] key=%s -> val=%s",
+ name, key, value);
return *value ? value : NULL;
/*
case MAPTYPE_DBD:
value = lookup_map_dbd(r, key, s->dbdq);
if (!value) {
- rewritelog((r, 5, NULL, "SQL map lookup FAILED: map %s key=%s",
- name, key));
+ rewritelog(r, 5, NULL, "SQL map lookup FAILED: map %s key=%s",
+ name, key);
return NULL;
}
- rewritelog((r, 5, NULL, "SQL map lookup OK: map %s key=%s, val=%s",
- name, key, value));
+ rewritelog(r, 5, NULL, "SQL map lookup OK: map %s key=%s, val=%s",
+ name, key, value);
return value;
case MAPTYPE_DBD_CACHE:
value = get_cache_value(s->cachename, 0, key, r->pool);
if (!value) {
- rewritelog((r, 6, NULL,
- "cache lookup FAILED, forcing new map lookup"));
+ rewritelog(r, 6, NULL,
+ "cache lookup FAILED, forcing new map lookup");
value = lookup_map_dbd(r, key, s->dbdq);
if (!value) {
- rewritelog((r, 5, NULL, "SQL map lookup FAILED: map %s key=%s",
- name, key));
+ rewritelog(r, 5, NULL, "SQL map lookup FAILED: map %s key=%s",
+ name, key);
set_cache_value(s->cachename, 0, key, "");
return NULL;
}
- rewritelog((r, 5, NULL, "SQL map lookup OK: map %s key=%s, val=%s",
- name, key, value));
+ rewritelog(r, 5, NULL, "SQL map lookup OK: map %s key=%s, val=%s",
+ name, key, value);
set_cache_value(s->cachename, 0, key, value);
return value;
}
- rewritelog((r, 5, NULL, "cache lookup OK: map=%s[SQL] key=%s, val=%s",
- name, key, value));
+ rewritelog(r, 5, NULL, "cache lookup OK: map=%s[SQL] key=%s, val=%s",
+ name, key, value);
return *value ? value : NULL;
/*
case MAPTYPE_PRG:
value = lookup_map_program(r, s->fpin, s->fpout, key);
if (!value) {
- rewritelog((r, 5,NULL,"map lookup FAILED: map=%s key=%s", name,
- key));
+ rewritelog(r, 5, NULL, "map lookup FAILED: map=%s key=%s", name,
+ key);
return NULL;
}
- rewritelog((r, 5, NULL, "map lookup OK: map=%s key=%s -> val=%s",
- name, key, value));
+ rewritelog(r, 5, NULL, "map lookup OK: map=%s key=%s -> val=%s",
+ name, key, value);
return value;
/*
case MAPTYPE_INT:
value = s->func(r, key);
if (!value) {
- rewritelog((r, 5,NULL,"map lookup FAILED: map=%s key=%s", name,
- key));
+ rewritelog(r, 5, NULL, "map lookup FAILED: map=%s key=%s", name,
+ key);
return NULL;
}
- rewritelog((r, 5, NULL, "map lookup OK: map=%s key=%s -> val=%s",
- name, key, value));
+ rewritelog(r, 5, NULL, "map lookup OK: map=%s key=%s -> val=%s",
+ name, key, value);
return value;
}
ctx->r = r;
ap_destroy_sub_req(rr);
- rewritelog((r, 5, ctx->perdir, "lookahead: path=%s var=%s "
- "-> val=%s", path, var+5, result));
+ rewritelog(r, 5, ctx->perdir, "lookahead: path=%s var=%s "
+ "-> val=%s", path, var+5, result);
return (char *)result;
}
ctx->r = r;
ap_destroy_sub_req(rr);
- rewritelog((r, 5, ctx->perdir, "lookahead: path=%s var=%s "
- "-> val=%s", path, var+5, result));
+ rewritelog(r, 5, ctx->perdir, "lookahead: path=%s var=%s "
+ "-> val=%s", path, var+5, result);
return (char *)result;
}
result = apr_psprintf(r->pool, "%04d%02d%02d%02d%02d%02d",
tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
- rewritelog((r, 1, ctx->perdir, "RESULT='%s'", result));
+ rewritelog(r, 1, ctx->perdir, "RESULT='%s'", result);
return (char *)result;
}
else if (!strcmp(var, "IPV6")) {
apr_sockaddr_t *addr = r->useragent_addr;
flag = (addr->family == AF_INET6 &&
!IN6_IS_ADDR_V4MAPPED((struct in6_addr *)addr->ipaddr_ptr));
- rewritelog((r, 1, ctx->perdir, "IPV6='%s'", flag ? "on" : "off"));
+ rewritelog(r, 1, ctx->perdir, "IPV6='%s'", flag ? "on" : "off");
#else
- rewritelog((r, 1, ctx->perdir, "IPV6='off' (IPv6 is not enabled)"));
+ rewritelog(r, 1, ctx->perdir, "IPV6='off' (IPv6 is not enabled)");
#endif
result = (flag ? "on" : "off");
}
tmp = apr_pstrmemdup(pool, bri->source + bri->regmatch[n].rm_so, span);
tmp2 = escape_backref(pool, tmp, entry->escapes, entry->noescapes,
entry->flags);
- rewritelog((ctx->r, 5, ctx->perdir, "escaping backreference '%s' to '%s'",
- tmp, tmp2));
+ rewritelog(ctx->r, 5, ctx->perdir, "escaping backreference '%s' to '%s'",
+ tmp, tmp2);
current->len = span = strlen(tmp2);
current->string = tmp2;
if (*name == '!') {
name++;
apr_table_unset(ctx->r->subprocess_env, name);
- rewritelog((ctx->r, 5, NULL, "unsetting env variable '%s'", name));
+ rewritelog(ctx->r, 5, NULL, "unsetting env variable '%s'", name);
}
else {
if ((val = ap_strchr(name, ':')) != NULL) {
}
apr_table_set(ctx->r->subprocess_env, name, val);
- rewritelog((ctx->r, 5, NULL, "setting env variable '%s' to '%s'",
- name, val));
+ rewritelog(ctx->r, 5, NULL, "setting env variable '%s' to '%s'",
+ name, val);
}
env = env->next;
apr_table_addn(rmain->err_headers_out, "Set-Cookie", cookie);
apr_pool_userdata_set("set", notename, NULL, rmain->pool);
- rewritelog((rmain, 5, NULL, "setting cookie '%s'", cookie));
+ rewritelog(rmain, 5, NULL, "setting cookie '%s'", cookie);
}
else {
- rewritelog((rmain, 5, NULL, "skipping already set cookie '%s'",
- var));
+ rewritelog(rmain, 5, NULL, "skipping already set cookie '%s'",
+ var);
}
}
if (rsub->status < 400) {
rc = 1;
}
- rewritelog((r, 5, NULL, "RewriteCond URI (-U) check: "
- "path=%s -> status=%d", input, rsub->status));
+ rewritelog(r, 5, NULL, "RewriteCond URI (-U check: "
+ "path=%s -> status=%d", input, rsub->status);
ap_destroy_sub_req(rsub);
}
break;
r->pool) == APR_SUCCESS) {
rc = 1;
}
- rewritelog((r, 5, NULL, "RewriteCond file (-F) check: path=%s "
+ rewritelog(r, 5, NULL, "RewriteCond file (-F check: path=%s "
"-> file=%s status=%d", input, rsub->filename,
- rsub->status));
+ rsub->status);
ap_destroy_sub_req(rsub);
}
break;
rc = ap_expr_exec_re(r, p->expr, AP_MAX_REG_MATCH, regmatch,
&source, &err);
if (rc < 0 || err) {
- rewritelog((r, 1, ctx->perdir,
+ rewritelog(r, 1, ctx->perdir,
"RewriteCond: expr='%s' evaluation failed: %s",
- p->pattern - p->pskip, err));
+ p->pattern - p->pskip, err);
rc = 0;
}
/* update briRC backref info */
rc = !rc;
}
- rewritelog((r, 4, ctx->perdir, "RewriteCond: input='%s' pattern='%s'%s "
- "=> %s", input, p->pattern - p->pskip,
- (p->flags & CONDFLAG_NOCASE) ? " [NC]" : "",
- rc ? "matched" : "not-matched"));
+ rewritelog(r, 4, ctx->perdir, "RewriteCond: input='%s' pattern='%s'%s "
+ "=> %s", input, p->pattern - p->pskip,
+ (p->flags & CONDFLAG_NOCASE) ? " [NC]" : "",
+ rc ? "matched" : "not-matched");
return rc;
}
if (*expanded) {
ap_str_tolower(expanded);
- rewritelog((ctx->r, 2, ctx->perdir, "remember %s to have MIME-type "
- "'%s'", ctx->r->filename, expanded));
+ rewritelog(ctx->r, 2, ctx->perdir, "remember %s to have MIME-type "
+ "'%s'", ctx->r->filename, expanded);
apr_table_setn(ctx->r->notes, REWRITE_FORCED_MIMETYPE_NOTEVAR,
expanded);
if (*expanded) {
ap_str_tolower(expanded);
- rewritelog((ctx->r, 2, ctx->perdir, "remember %s to have "
- "Content-handler '%s'", ctx->r->filename, expanded));
+ rewritelog(ctx->r, 2, ctx->perdir, "remember %s to have "
+ "Content-handler '%s'", ctx->r->filename, expanded);
apr_table_setn(ctx->r->notes, REWRITE_FORCED_HANDLER_NOTEVAR,
expanded);
* to re-add the PATH_INFO postfix
*/
if (r->path_info && *r->path_info) {
- rewritelog((r, 3, ctx->perdir, "add path info postfix: %s -> %s%s",
- ctx->uri, ctx->uri, r->path_info));
+ rewritelog(r, 3, ctx->perdir, "add path info postfix: %s -> %s%s",
+ ctx->uri, ctx->uri, r->path_info);
ctx->uri = apr_pstrcat(r->pool, ctx->uri, r->path_info, NULL);
}
if (!is_proxyreq && strlen(ctx->uri) >= dirlen &&
!strncmp(ctx->uri, ctx->perdir, dirlen)) {
- rewritelog((r, 3, ctx->perdir, "strip per-dir prefix: %s -> %s",
- ctx->uri, ctx->uri + dirlen));
+ rewritelog(r, 3, ctx->perdir, "strip per-dir prefix: %s -> %s",
+ ctx->uri, ctx->uri + dirlen);
ctx->uri = ctx->uri + dirlen;
}
}
/* Try to match the URI against the RewriteRule pattern
* and exit immediately if it didn't apply.
*/
- rewritelog((r, 3, ctx->perdir, "applying pattern '%s' to uri '%s'",
- p->pattern, ctx->uri));
+ rewritelog(r, 3, ctx->perdir, "applying pattern '%s' to uri '%s'",
+ p->pattern, ctx->uri);
rc = !ap_regexec(p->regexp, ctx->uri, AP_MAX_REG_MATCH, regmatch, 0);
if (! (( rc && !(p->flags & RULEFLAG_NOTMATCH)) ||
else {
newuri = do_expand(p->output, ctx, p, &unsafe_qmark);
}
- rewritelog((r, 2, ctx->perdir, "rewrite '%s' -> '%s'", ctx->uri,
- newuri));
+ rewritelog(r, 2, ctx->perdir, "rewrite '%s' -> '%s'", ctx->uri,
+ newuri);
if (unsafe_qmark > 0) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(10508)
force_type_handler(p, ctx);
if (p->flags & RULEFLAG_STATUS) {
- rewritelog((r, 2, ctx->perdir, "forcing responsecode %d for %s",
- p->forced_responsecode, r->filename));
+ rewritelog(r, 2, ctx->perdir, "forcing responsecode %d for %s",
+ p->forced_responsecode, r->filename);
r->status = p->forced_responsecode;
}
&& !AP_IS_SLASH(*newuri)
&& !is_absolute_uri(newuri, NULL)) {
if (ctx->perdir) {
- rewritelog((r, 3, ctx->perdir, "add per-dir prefix: %s -> %s%s",
- newuri, ctx->perdir, newuri));
+ rewritelog(r, 3, ctx->perdir, "add per-dir prefix: %s -> %s%s",
+ newuri, ctx->perdir, newuri);
+
newuri = apr_pstrcat(r->pool, ctx->perdir, newuri, NULL);
}
else if (!(p->flags & (RULEFLAG_PROXY | RULEFLAG_FORCEREDIRECT))) {
* like "/some/pathscheme:..." to produce the fully qualified URL
* "scheme:..." which could be misinterpreted later.
*/
- rewritelog((r, 3, ctx->perdir, "add root prefix: %s -> /%s",
- newuri, newuri));
+ rewritelog(r, 3, ctx->perdir, "add root prefix: %s -> /%s",
+ newuri, newuri);
newuri = apr_pstrcat(r->pool, "/", newuri, NULL);
}
char *old_filename = r->filename;
r->filename = ap_escape_uri(r->pool, r->filename);
- rewritelog((r, 2, ctx->perdir, "escaped URI in per-dir context "
- "for proxy, %s -> %s", old_filename, r->filename));
+ rewritelog(r, 2, ctx->perdir, "escaped URI in per-dir context "
+ "for proxy, %s -> %s", old_filename, r->filename);
}
fully_qualify_uri(r);
- rewritelog((r, 2, ctx->perdir, "forcing proxy-throughput with %s",
- r->filename));
+ rewritelog(r, 2, ctx->perdir, "forcing proxy-throughput with %s",
+ r->filename);
r->filename = apr_pstrcat(r->pool, "proxy:", r->filename, NULL);
return RULE_RC_MATCH;
if (p->flags & RULEFLAG_FORCEREDIRECT) {
fully_qualify_uri(r);
- rewritelog((r, 2, ctx->perdir, "explicitly forcing redirect with %s",
- r->filename));
+ rewritelog(r, 2, ctx->perdir, "explicitly forcing redirect with %s",
+ r->filename);
r->status = p->forced_responsecode;
return RULE_RC_MATCH;
* directly force an external HTTP redirect.
*/
if (is_absolute_uri(r->filename, NULL)) {
- rewritelog((r, 2, ctx->perdir, "implicitly forcing redirect (rc=%d) "
- "with %s", p->forced_responsecode, r->filename));
+ rewritelog(r, 2, ctx->perdir, "implicitly forcing redirect (rc=%d "
+ "with %s", p->forced_responsecode, r->filename);
r->status = p->forced_responsecode;
return RULE_RC_MATCH;
if (rc != RULE_RC_NOMATCH) {
if (!(p->flags & RULEFLAG_NOSUB)) {
- rewritelog((r, 2, perdir, "setting lastsub to rule with output %s", p->output));
+ rewritelog(r, 2, perdir, "setting lastsub to rule with output %s", p->output);
*lastsub = p;
}
* modules like mod_alias, mod_userdir, etc.
*/
if (p->flags & RULEFLAG_PASSTHROUGH) {
- rewritelog((r, 2, perdir, "forcing '%s' to get passed through "
- "to next API URI-to-filename handler", r->filename));
+ rewritelog(r, 2, perdir, "forcing '%s' to get passed through "
+ "to next API URI-to-filename handler", r->filename);
r->filename = apr_pstrcat(r->pool, "passthrough:",
r->filename, NULL);
changed = ACTION_NORMAL;
}
if (p->flags & RULEFLAG_END) {
- rewritelog((r, 8, perdir, "Rule has END flag, no further rewriting for this request"));
+ rewritelog(r, 8, perdir, "Rule has END flag, no further rewriting for this request");
apr_pool_userdata_set("1", really_last_key, apr_pool_cleanup_null, r->pool);
break;
}
/* END flag was used as a RewriteRule flag on this request */
apr_pool_userdata_get(&skipdata, really_last_key, r->pool);
if (skipdata != NULL) {
- rewritelog((r, 8, NULL, "Declining, no further rewriting due to END flag"));
+ rewritelog(r, 8, NULL, "Declining, no further rewriting due to END flag");
return DECLINED;
}
if ((dconf->options & OPTION_ANYURI) == 0
&& ((r->unparsed_uri[0] == '*' && r->unparsed_uri[1] == '\0')
|| !r->uri || r->uri[0] != '/')) {
- rewritelog((r, 8, NULL, "Declining, request-URI '%s' is not a URL-path. "
+ rewritelog(r, 8, NULL, "Declining, request-URI '%s' is not a URL-path. "
"Consult the manual entry for the RewriteOptions directive "
"for options and caveats about matching other strings.",
- r->uri));
+ r->uri);
return DECLINED;
}
*/
if (r->filename == NULL) {
r->filename = apr_pstrdup(r->pool, r->uri);
- rewritelog((r, 2, NULL, "init rewrite engine with requested uri %s",
- r->filename));
+ rewritelog(r, 2, NULL, "init rewrite engine with requested uri %s",
+ r->filename);
}
else {
- rewritelog((r, 2, NULL, "init rewrite engine with passed filename "
- "%s. Original uri = %s", r->filename, r->uri));
+ rewritelog(r, 2, NULL, "init rewrite engine with passed filename "
+ "%s. Original uri = %s", r->filename, r->uri);
}
/*
apr_psprintf(r->pool,"%d",rulestatus));
}
else {
- rewritelog((r, 2, NULL, "uri already rewritten. Status %s, Uri %s, "
- "r->filename %s", saved_rulestatus, r->uri, r->filename));
+ rewritelog(r, 2, NULL, "uri already rewritten. Status %s, Uri %s, "
+ "r->filename %s", saved_rulestatus, r->uri, r->filename);
rulestatus = atoi(saved_rulestatus);
}
}
r->handler = "proxy-server";
- rewritelog((r, 1, NULL, "go-ahead with proxy request %s [OK]",
- r->filename));
+ rewritelog(r, 1, NULL, "go-ahead with proxy request %s [OK]",
+ r->filename);
return OK;
}
else if (skip_absolute > 0) {
/* it was finally rewritten to a remote URL */
if (rulestatus != ACTION_NOESCAPE) {
- rewritelog((r, 1, NULL, "escaping %s for redirect",
- r->filename));
+ rewritelog(r, 1, NULL, "escaping %s for redirect",
+ r->filename);
r->filename = escape_absolute_uri(r->pool, r->filename, skip_absolute);
}
ap_escape_uri(r->pool, r->args)),
NULL);
- rewritelog((r, 1, NULL, "%s %s to query string for redirect %s",
- noescape ? "copying" : "escaping",
- r->args ,
- noescape ? "" : escaped_args));
+ rewritelog(r, 1, NULL, "%s %s to query string for redirect %s",
+ noescape ? "copying" : "escaping",
+ r->args ,
+ noescape ? "" : escaped_args);
}
/* determine HTTP redirect response code */
/* now do the redirection */
apr_table_setn(r->headers_out, "Location", r->filename);
- rewritelog((r, 1, NULL, "redirect to %s [REDIRECT/%d]", r->filename,
- n));
+ rewritelog(r, 1, NULL, "redirect to %s [REDIRECT/%d]", r->filename,
+ n);
return n;
}
#if APR_HAS_USER
r->filename = expand_tildepaths(r, r->filename);
#endif
- rewritelog((r, 2, NULL, "local path result: %s", r->filename));
+ rewritelog(r, 2, NULL, "local path result: %s", r->filename);
/* the filename must be either an absolute local path or an
* absolute local URL.
r->uri = tmp;
if (res != OK) {
- rewritelog((r, 1, NULL, "prefixing with document_root of %s"
- " FAILED", r->filename));
+ rewritelog(r, 1, NULL, "prefixing with document_root of %s"
+ " FAILED", r->filename);
return res;
}
- rewritelog((r, 2, NULL, "prefixed with document_root to %s",
- r->filename));
+ rewritelog(r, 2, NULL, "prefixed with document_root to %s",
+ r->filename);
}
- rewritelog((r, 1, NULL, "go-ahead with %s [OK]", r->filename));
+ rewritelog(r, 1, NULL, "go-ahead with %s [OK]", r->filename);
return OK;
}
}
else {
- rewritelog((r, 1, NULL, "pass through %s", r->filename));
+ rewritelog(r, 1, NULL, "pass through %s", r->filename);
return DECLINED;
}
}
/* END flag was used as a RewriteRule flag on this request */
apr_pool_userdata_get(&skipdata, really_last_key, r->pool);
if (skipdata != NULL) {
- rewritelog((r, 8, dconf->directory, "Declining, no further rewriting due to END flag"));
+ rewritelog(r, 8, dconf->directory, "Declining, no further rewriting due to END flag");
return DECLINED;
}
if (r->filename == NULL) {
r->filename = apr_pstrdup(r->pool, r->uri);
- rewritelog((r, 2, dconf->directory, "init rewrite engine with"
- " requested uri %s", r->filename));
+ rewritelog(r, 2, dconf->directory, "init rewrite engine with"
+ " requested uri %s", r->filename);
}
/*
}
r->handler = "proxy-server";
- rewritelog((r, 1, dconf->directory, "go-ahead with proxy request "
- "%s [OK]", r->filename));
+ rewritelog(r, 1, dconf->directory, "go-ahead with proxy request "
+ "%s [OK]", r->filename);
return OK;
}
else if (skip_absolute > 0) {
cp = r->filename + skip_absolute;
if ((cp = ap_strchr(cp, '/')) != NULL && *(++cp)) {
- rewritelog((r, 2, dconf->directory,
- "trying to replace prefix %s with %s",
- dconf->directory, dconf->baseurl));
+ rewritelog(r, 2, dconf->directory,
+ "trying to replace prefix %s with %s",
+ dconf->directory, dconf->baseurl);
/* I think, that hack needs an explanation:
* well, here is it:
/* now prepare the redirect... */
if (rulestatus != ACTION_NOESCAPE) {
- rewritelog((r, 1, dconf->directory, "escaping %s for redirect",
- r->filename));
+ rewritelog(r, 1, dconf->directory, "escaping %s for redirect",
+ r->filename);
r->filename = escape_absolute_uri(r->pool, r->filename, skip_absolute);
}
: (escaped_args = ap_escape_uri(r->pool, r->args)),
NULL);
- rewritelog((r, 1, dconf->directory, "%s %s to query string for redirect %s",
- noescape ? "copying" : "escaping",
- r->args ,
- noescape ? "" : escaped_args));
+ rewritelog(r, 1, dconf->directory, "%s %s to query string for redirect %s",
+ noescape ? "copying" : "escaping",
+ r->args ,
+ noescape ? "" : escaped_args);
}
/* determine HTTP redirect response code */
/* now do the redirection */
apr_table_setn(r->headers_out, "Location", r->filename);
- rewritelog((r, 1, dconf->directory, "redirect to %s [REDIRECT/%d]",
- r->filename, n));
+ rewritelog(r, 1, dconf->directory, "redirect to %s [REDIRECT/%d]",
+ r->filename, n);
return n;
}
else {
* this would lead to a deadloop.
*/
if (ofilename != NULL && strcmp(r->filename, ofilename) == 0) {
- rewritelog((r, 1, dconf->directory, "initial URL equal rewritten"
- " URL: %s [IGNORING REWRITE]", r->filename));
+ rewritelog(r, 1, dconf->directory, "initial URL equal rewritten"
+ " URL: %s [IGNORING REWRITE]", r->filename);
return OK;
}
* plain URL
*/
if (dconf->baseurl != NULL) {
- rewritelog((r, 2, dconf->directory, "trying to replace prefix "
- "%s with %s", dconf->directory, dconf->baseurl));
+ rewritelog(r, 2, dconf->directory, "trying to replace prefix "
+ "%s with %s", dconf->directory, dconf->baseurl);
r->filename = subst_prefix_path(r, r->filename,
dconf->directory,
}
if (!strncmp(r->filename, ccp, l) &&
r->filename[l] == '/') {
- rewritelog((r, 2,dconf->directory, "strip document_root"
- " prefix: %s -> %s", r->filename,
- r->filename+l));
+ rewritelog(r, 2,dconf->directory, "strip document_root"
+ " prefix: %s -> %s", r->filename,
+ r->filename+l);
r->filename = apr_pstrdup(r->pool, r->filename+l);
}
if ((ccp = ap_context_document_root(r)) != NULL) {
const char *prefix = ap_context_prefix(r);
if (prefix != NULL) {
- rewritelog((r, 2, dconf->directory, "trying to replace "
+ rewritelog(r, 2, dconf->directory, "trying to replace "
"context docroot %s with context prefix %s",
- ccp, prefix));
+ ccp, prefix);
r->filename = subst_prefix_path(r, r->filename,
ccp, prefix);
}
apr_table_setn(r->notes, "redirect-keeps-vary", "");
/* now initiate the internal redirect */
- rewritelog((r, 1, dconf->directory, "internal redirect with %s "
- "[INTERNAL REDIRECT]", r->filename));
+ rewritelog(r, 1, dconf->directory, "internal redirect with %s "
+ "[INTERNAL REDIRECT]", r->filename);
r->filename = apr_pstrcat(r->pool, "redirect:", r->filename, NULL);
r->handler = REWRITE_REDIRECT_HANDLER_NAME;
return OK;
}
}
else {
- rewritelog((r, 1, dconf->directory, "pass through %s", r->filename));
+ rewritelog(r, 1, dconf->directory, "pass through %s", r->filename);
r->filename = ofilename;
return DECLINED;
}
/* type */
t = apr_table_get(r->notes, REWRITE_FORCED_MIMETYPE_NOTEVAR);
if (t && *t) {
- rewritelog((r, 1, NULL, "force filename %s to have MIME-type '%s'",
- r->filename, t));
+ rewritelog(r, 1, NULL, "force filename %s to have MIME-type '%s'",
+ r->filename, t);
ap_set_content_type_ex(r, t, 1);
}
/* handler */
t = apr_table_get(r->notes, REWRITE_FORCED_HANDLER_NOTEVAR);
if (t && *t) {
- rewritelog((r, 1, NULL, "force filename %s to have the "
- "Content-handler '%s'", r->filename, t));
+ rewritelog(r, 1, NULL, "force filename %s to have the "
+ "Content-handler '%s'", r->filename, t);
r->handler = t;
}
projects / thirdparty / apache / httpd.git / commitdiff
