From 8ec81e15245c09b3f5004699acc066617fd71da4 Mon Sep 17 00:00:00 2001 From: Chuck Murcko Date: Sun, 18 Mar 2001 04:56:26 +0000 Subject: [PATCH] The mod_proxy side of Graham's Auth patch Obtained from: Graham Leggett Reviewed by: Chuck Murcko git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88533 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy.c | 8 ++++---- modules/proxy/proxy_ftp.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 2b4c5d06aa..4e707ff8f9 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -156,7 +156,7 @@ static int proxy_detect(request_rec *r) && !strcasecmp(r->parsed_uri.scheme, ap_http_method(r)) && ap_matches_request_vhost(r, r->parsed_uri.hostname, r->parsed_uri.port_str ? r->parsed_uri.port : ap_default_port(r)))) { - r->proxyreq = 1; + r->proxyreq = PROXYREQ_PROXY; r->uri = r->unparsed_uri; r->filename = apr_pstrcat(r->pool, "proxy:", r->uri, NULL); r->handler = "proxy-server"; @@ -166,7 +166,7 @@ static int proxy_detect(request_rec *r) else if (conf->req && r->method_number == M_CONNECT && r->parsed_uri.hostname && r->parsed_uri.port_str) { - r->proxyreq = 1; + r->proxyreq = PROXYREQ_PROXY; r->uri = r->unparsed_uri; r->filename = apr_pstrcat(r->pool, "proxy:", r->uri, NULL); r->handler = "proxy-server"; @@ -201,7 +201,7 @@ static int proxy_trans(request_rec *r) r->filename = apr_pstrcat(r->pool, "proxy:", ent[i].real, r->uri + len, NULL); r->handler = "proxy-server"; - r->proxyreq = 1; + r->proxyreq = PROXYREQ_REVERSE; return OK; } } @@ -303,7 +303,7 @@ static int proxy_handler(request_rec *r) long maxfwd = strtol(maxfwd_str, NULL, 10); if (maxfwd < 1) { int access_status; - r->proxyreq = 0; + r->proxyreq = PROXYREQ_NONE; if ((access_status = ap_send_http_trace(r))) ap_die(access_status, r); else diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c index 096d836d9e..7b3b2af7a8 100644 --- a/modules/proxy/proxy_ftp.c +++ b/modules/proxy/proxy_ftp.c @@ -438,7 +438,7 @@ static long int send_dir(BUFF *f, request_rec *r, ap_cache_el *c, char *cwd) */ static int ftp_unauthorized (request_rec *r, int log_it) { - r->proxyreq = 0; + r->proxyreq = PROXYREQ_NONE; /* Log failed requests if they supplied a password * (log username/password guessing attempts) */ -- 2.40.0