diff options
| author | Chuck Murcko <chuck@apache.org> | 2001-03-16 08:28:08 +0100 |
|---|---|---|
| committer | Chuck Murcko <chuck@apache.org> | 2001-03-16 08:28:08 +0100 |
| commit | 93463cfc17be43ebd44b6e13e94ff189f4ef49eb (patch) | |
| tree | 8a5d6cec1e87633b11947c373f144f4a4e6b7ac6 /modules/aaa/mod_auth_digest.c | |
| parent | change INADDR_NONE to APR_INADDR_NONE (diff) | |
| download | apache2-93463cfc17be43ebd44b6e13e94ff189f4ef49eb.tar.xz apache2-93463cfc17be43ebd44b6e13e94ff189f4ef49eb.zip | |
This is a fix that went into v1.3 quite a while back, but not into v2.0.
It sorts out the problem when a password protected reverse proxy URL
sends a Proxy-Authenticate to a browser instead of a WWW-Authenticate.
This patch covers the changes to the httpd-2.0 tree.
Submitted by: Graham Leggett
Reviewed by: Chuck Murcko
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88527 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/aaa/mod_auth_digest.c')
| -rw-r--r-- | modules/aaa/mod_auth_digest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c index e532b96826..4359620549 100644 --- a/modules/aaa/mod_auth_digest.c +++ b/modules/aaa/mod_auth_digest.c @@ -854,7 +854,7 @@ static int get_digest_rec(request_rec *r, digest_header_rec *resp) char *key, *value; auth_line = apr_table_get(r->headers_in, - r->proxyreq ? "Proxy-Authorization" + (PROXYREQ_PROXY == r->proxyreq) ? "Proxy-Authorization" : "Authorization"); if (!auth_line) { resp->auth_hdr_sts = NO_HEADER; @@ -1322,7 +1322,7 @@ static void note_digest_auth_failure(request_rec *r, } apr_table_mergen(r->err_headers_out, - r->proxyreq ? "Proxy-Authenticate" : "WWW-Authenticate", + (PROXYREQ_PROXY == r->proxyreq) ? "Proxy-Authenticate" : "WWW-Authenticate", apr_psprintf(r->pool, "Digest realm=\"%s\", nonce=\"%s\", " "algorithm=%s%s%s%s%s", ap_auth_name(r), nonce, conf->algorithm, @@ -2050,7 +2050,7 @@ static int add_auth_info(request_rec *r) if (ai && ai[0]) apr_table_mergen(r->headers_out, - r->proxyreq ? "Proxy-Authentication-Info" + (PROXYREQ_PROXY == r->proxyreq) ? "Proxy-Authentication-Info" : "Authentication-Info", ai); return OK; |