Index: include/httpd.h =================================================================== --- include/httpd.h (revision 1204177) +++ include/httpd.h (working copy) @@ -1003,6 +1003,12 @@ apr_uri_t parsed_uri; /** finfo.protection (st_mode) set to zero if no such file */ apr_finfo_t finfo; + + /** remote address information from conn_rec, can be overridden if + * necessary by a module. + */ + apr_sockaddr_t *remote_addr; + char *remote_ip; }; /** Index: server/util_expr_eval.c =================================================================== --- server/util_expr_eval.c (revision 1204177) +++ server/util_expr_eval.c (working copy) @@ -1181,10 +1181,9 @@ static APR_OPTIONAL_FN_TYPE(ssl_is_https) *is_https = NULL; static const char *conn_var_names[] = { - "REMOTE_ADDR", /* 0 */ - "HTTPS", /* 1 */ - "IPV6", /* 2 */ - "CONN_LOG_ID", /* 3 */ + "HTTPS", /* 0 */ + "IPV6", /* 1 */ + "CONN_LOG_ID", /* 2 */ NULL }; @@ -1197,13 +1196,11 @@ switch (index) { case 0: - return c->remote_ip; - case 1: if (is_https && is_https(c)) return "on"; else return "off"; - case 2: + case 1: #if APR_HAVE_IPV6 { apr_sockaddr_t *addr = c->remote_addr; @@ -1216,7 +1213,7 @@ #else return "off"; #endif - case 3: + case 2: return c->log_id; default: ap_assert(0); @@ -1253,6 +1250,7 @@ "CONTEXT_PREFIX", /* 25 */ "CONTEXT_DOCUMENT_ROOT", /* 26 */ "REQUEST_STATUS", /* 27 */ + "REMOTE_ADDR", /* 28 */ NULL }; @@ -1338,6 +1336,8 @@ return ap_context_document_root(r); case 27: return r->status ? apr_psprintf(ctx->p, "%d", r->status) : ""; + case 28: + return r->remote_ip; default: ap_assert(0); return NULL; @@ -1483,10 +1483,10 @@ AP_DEBUG_ASSERT(subnet != NULL); - if (!ctx->c) + if (!ctx->r) return FALSE; - return apr_ipsubnet_test(subnet, ctx->c->remote_addr); + return apr_ipsubnet_test(subnet, ctx->r->remote_addr); } static int op_T(ap_expr_eval_ctx_t *ctx, const void *data, const char *arg) Index: server/protocol.c =================================================================== --- server/protocol.c (revision 1204177) +++ server/protocol.c (working copy) @@ -979,6 +979,9 @@ */ r->used_path_info = AP_REQ_DEFAULT_PATH_INFO; + r->remote_addr = conn->remote_addr; + r->remote_ip = conn->remote_ip; + tmp_bb = apr_brigade_create(r->pool, r->connection->bucket_alloc); ap_run_pre_read_request(r, conn); Index: server/util_script.c =================================================================== --- server/util_script.c (revision 1204177) +++ server/util_script.c (working copy) @@ -235,7 +235,7 @@ apr_psprintf(r->pool, "%u", ap_get_server_port(r))); add_unless_null(e, "REMOTE_HOST", ap_get_remote_host(c, r->per_dir_config, REMOTE_HOST, NULL)); - apr_table_addn(e, "REMOTE_ADDR", c->remote_ip); + apr_table_addn(e, "REMOTE_ADDR", r->remote_ip); apr_table_addn(e, "DOCUMENT_ROOT", ap_document_root(r)); /* Apache */ apr_table_setn(e, "REQUEST_SCHEME", ap_http_scheme(r)); apr_table_addn(e, "CONTEXT_PREFIX", ap_context_prefix(r)); @@ -243,7 +243,7 @@ apr_table_addn(e, "SERVER_ADMIN", s->server_admin); /* Apache */ apr_table_addn(e, "SCRIPT_FILENAME", r->filename); /* Apache */ - rport = c->remote_addr->port; + rport = r->remote_addr->port; apr_table_addn(e, "REMOTE_PORT", apr_itoa(r->pool, rport)); if (r->user) { Index: server/log.c =================================================================== --- server/log.c (revision 1204177) +++ server/log.c (working copy) @@ -561,9 +561,9 @@ static int log_remote_address(const ap_errorlog_info *info, const char *arg, char *buf, int buflen) { - if (info->c) - return apr_snprintf(buf, buflen, "%s:%d", info->c->remote_ip, - info->c->remote_addr->port); + if (info->r) + return apr_snprintf(buf, buflen, "%s:%d", info->r->remote_ip, + info->r->remote_addr->port); else return 0; } @@ -578,6 +578,16 @@ return 0; } +static int log_conn_remote_address(const ap_errorlog_info *info, const char *arg, + char *buf, int buflen) +{ + if (info->c) + return apr_snprintf(buf, buflen, "%s:%d", info->c->remote_ip, + info->c->remote_addr->port); + else + return 0; +} + static int log_pid(const ap_errorlog_info *info, const char *arg, char *buf, int buflen) { @@ -897,6 +907,7 @@ ap_register_errorlog_handler(p, "T", log_tid, 0); ap_register_errorlog_handler(p, "v", log_virtual_host, 0); ap_register_errorlog_handler(p, "V", log_server_name, 0); + ap_register_errorlog_handler(p, "d", log_conn_remote_address, 0); } /* @@ -958,12 +969,17 @@ } } - if (info->c) { - /* - * remote_ip can be client or backend server. If we have a scoreboard - * handle, it is likely a client. - */ + /* + * remote_ip can be client or backend server. If we have a scoreboard + * handle, it is likely a client. + */ + if (info->r) { len += apr_snprintf(buf + len, buflen - len, + info->r->connection->sbh ? "[client %s:%d] " : "[remote %s:%d] ", + info->r->remote_ip, info->r->remote_addr->port); + } + else if (info->c) { + len += apr_snprintf(buf + len, buflen - len, info->c->sbh ? "[client %s:%d] " : "[remote %s:%d] ", info->c->remote_ip, info->c->remote_addr->port); } Index: server/request.c =================================================================== --- server/request.c (revision 1204177) +++ server/request.c (working copy) @@ -1832,6 +1832,9 @@ rnew->output_filters = r->proto_output_filters; } + rnew->remote_addr = r->remote_addr; + rnew->remote_ip = r->remote_ip; + /* no input filters for a subrequest */ ap_set_sub_req_protocol(rnew, r); Index: modules/http/http_request.c =================================================================== --- modules/http/http_request.c (revision 1204177) +++ modules/http/http_request.c (working copy) @@ -439,6 +439,9 @@ new->prev = r; r->next = new; + new->remote_addr = r->remote_addr; + new->remote_ip = r->remote_ip; + /* Must have prev and next pointers set before calling create_request * hook. */ Index: modules/proxy/mod_proxy_http.c =================================================================== --- modules/proxy/mod_proxy_http.c (revision 1204177) +++ modules/proxy/mod_proxy_http.c (working copy) @@ -858,7 +858,7 @@ * determine, where the original request came from. */ apr_table_mergen(r->headers_in, "X-Forwarded-For", - c->remote_ip); + r->remote_ip); /* Add X-Forwarded-Host: so that upstream knows what the * original request hostname was. Index: modules/proxy/ajp_header.c =================================================================== --- modules/proxy/ajp_header.c (revision 1204177) +++ modules/proxy/ajp_header.c (working copy) @@ -247,7 +247,7 @@ ajp_msg_append_uint8(msg, (apr_byte_t) method) || ajp_msg_append_string(msg, r->protocol) || ajp_msg_append_string(msg, uri->path) || - ajp_msg_append_string(msg, r->connection->remote_ip) || + ajp_msg_append_string(msg, r->remote_ip) || ajp_msg_append_string(msg, remote_host) || ajp_msg_append_string(msg, ap_get_server_name(r)) || ajp_msg_append_uint16(msg, (apr_uint16_t)r->connection->local_addr->port) || @@ -413,7 +413,7 @@ */ { const char *key = SC_A_REQ_REMOTE_PORT; - char *val = apr_itoa(r->pool, r->connection->remote_addr->port); + char *val = apr_itoa(r->pool, r->remote_addr->port); if (ajp_msg_append_uint8(msg, SC_A_REQ_ATTRIBUTE) || ajp_msg_append_string(msg, key) || ajp_msg_append_string(msg, val)) { Index: modules/aaa/mod_access_compat.c =================================================================== --- modules/aaa/mod_access_compat.c (revision 1204177) +++ modules/aaa/mod_access_compat.c (working copy) @@ -271,7 +271,7 @@ return 1; case T_IP: - if (apr_ipsubnet_test(ap[i].x.ip, r->connection->remote_addr)) { + if (apr_ipsubnet_test(ap[i].x.ip, r->remote_addr)) { return 1; } break; Index: modules/aaa/mod_authz_host.c =================================================================== --- modules/aaa/mod_authz_host.c (revision 1204177) +++ modules/aaa/mod_authz_host.c (working copy) @@ -153,7 +153,7 @@ apr_ipsubnet_t **ip = (apr_ipsubnet_t **)parsed_require_line; while (*ip) { - if (apr_ipsubnet_test(*ip, r->connection->remote_addr)) + if (apr_ipsubnet_test(*ip, r->remote_addr)) return AUTHZ_GRANTED; ip++; } @@ -201,10 +201,10 @@ const void *parsed_require_line) { if ( apr_sockaddr_equal(r->connection->local_addr, - r->connection->remote_addr) - || apr_ipsubnet_test(localhost_v4, r->connection->remote_addr) + r->remote_addr) + || apr_ipsubnet_test(localhost_v4, r->remote_addr) #if APR_HAVE_IPV6 - || apr_ipsubnet_test(localhost_v6, r->connection->remote_addr) + || apr_ipsubnet_test(localhost_v6, r->remote_addr) #endif ) { Index: modules/ssl/ssl_engine_vars.c =================================================================== --- modules/ssl/ssl_engine_vars.c (revision 1204177) +++ modules/ssl/ssl_engine_vars.c (working copy) @@ -187,6 +187,8 @@ result = r->uri; else if (strcEQ(var, "REQUEST_FILENAME")) result = r->filename; + else if (strcEQ(var, "REMOTE_ADDR")) + result = r->remote_ip; else if (strcEQ(var, "REMOTE_HOST")) result = ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME, NULL); @@ -242,8 +244,6 @@ if (strlen(var) > 4 && strcEQn(var, "SSL_", 4) && sslconn && sslconn->ssl) result = ssl_var_lookup_ssl(p, c, r, var+4); - else if (strcEQ(var, "REMOTE_ADDR")) - result = c->remote_ip; else if (strcEQ(var, "HTTPS")) { if (sslconn && sslconn->ssl) result = "on"; Index: modules/ssl/ssl_engine_kernel.c =================================================================== --- modules/ssl/ssl_engine_kernel.c (revision 1204177) +++ modules/ssl/ssl_engine_kernel.c (working copy) @@ -917,7 +917,7 @@ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "Access to %s denied for %s " "(requirement expression not fulfilled)", - r->filename, r->connection->remote_ip); + r->filename, r->remote_ip); ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, "Failed expression: %s", req->cpExpr); Index: modules/loggers/mod_log_config.c =================================================================== --- modules/loggers/mod_log_config.c (revision 1204177) +++ modules/loggers/mod_log_config.c (working copy) @@ -310,7 +310,7 @@ static const char *log_remote_address(request_rec *r, char *a) { - return r->connection->remote_ip; + return r->remote_ip; } static const char *log_local_address(request_rec *r, char *a) @@ -318,6 +318,11 @@ return r->connection->local_ip; } +static const char *log_conn_remote_address(request_rec *r, char *a) +{ + return r->connection->remote_ip; +} + static const char *log_remote_logname(request_rec *r, char *a) { return ap_escape_logitem(r->pool, ap_get_remote_logname(r)); @@ -758,7 +763,7 @@ port = r->server->port ? r->server->port : ap_default_port(r); } else if (!strcasecmp(a, "remote")) { - port = r->connection->remote_addr->port; + port = r->remote_addr->port; } else if (!strcasecmp(a, "local")) { port = r->connection->local_addr->port; @@ -1661,6 +1666,7 @@ log_pfn_register(p, "U", log_request_uri, 1); log_pfn_register(p, "s", log_status, 1); log_pfn_register(p, "R", log_handler, 1); + log_pfn_register(p, "d", log_conn_remote_address, 0 ); } /* reset to default conditions */ Index: modules/mappers/mod_rewrite.c =================================================================== --- modules/mappers/mod_rewrite.c (revision 1204177) +++ modules/mappers/mod_rewrite.c (working copy) @@ -1860,7 +1860,7 @@ else if (!strcmp(var, "IPV6")) { int flag = FALSE; #if APR_HAVE_IPV6 - apr_sockaddr_t *addr = r->connection->remote_addr; + apr_sockaddr_t *addr = r->remote_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")); @@ -1966,7 +1966,7 @@ case 'D': if (*var == 'R' && !strcmp(var, "REMOTE_ADDR")) { - result = r->connection->remote_ip; + result = r->remote_ip; } else if (!strcmp(var, "SERVER_ADDR")) { result = r->connection->local_ip; @@ -2005,7 +2005,7 @@ REMOTE_NAME, NULL); } else if (!strcmp(var, "REMOTE_PORT")) { - return apr_itoa(r->pool, r->connection->remote_addr->port); + return apr_itoa(r->pool, r->remote_addr->port); } break; Index: modules/filters/mod_ext_filter.c =================================================================== --- modules/filters/mod_ext_filter.c (revision 1204177) +++ modules/filters/mod_ext_filter.c (working copy) @@ -406,7 +406,7 @@ apr_file_printf(stderr_log, "[%s] [client %s] mod_ext_filter (%d)%s: %s\n", time_str, - r->connection->remote_ip, + r->remote_ip, err, apr_strerror(err, errbuf, sizeof(errbuf)), description); Index: modules/arch/netware/mod_nw_ssl.c =================================================================== --- modules/arch/netware/mod_nw_ssl.c (revision 1204177) +++ modules/arch/netware/mod_nw_ssl.c (working copy) @@ -1000,6 +1000,8 @@ result = r->uri; else if (strcEQ(var, "REQUEST_FILENAME")) result = r->filename; + else if (strcEQ(var, "REMOTE_ADDR")) + result = r->remote_ip; else if (strcEQ(var, "REMOTE_HOST")) result = ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME, NULL); @@ -1055,8 +1057,6 @@ if (strlen(var) > 4 && strcEQn(var, "SSL_", 4)) result = NULL; - else if (strcEQ(var, "REMOTE_ADDR")) - result = c->remote_ip; } /* Index: modules/metadata/mod_setenvif.c =================================================================== --- modules/metadata/mod_setenvif.c (revision 1204177) +++ modules/metadata/mod_setenvif.c (working copy) @@ -527,7 +527,7 @@ last_name = b->name; switch (b->special_type) { case SPECIAL_REMOTE_ADDR: - val = r->connection->remote_ip; + val = r->remote_ip; break; case SPECIAL_SERVER_ADDR: val = r->connection->local_ip;