From 24046edbbb472103ba561d7589f4786d0fe8067e Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Tue, 18 Oct 2005 23:15:28 +0000 Subject: [PATCH] MFH: Fixed bug #34905 (Digest authentication does not work with Apache 1). --- NEWS | 1 + sapi/apache/mod_php5.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index b2ef6b70e0c..0c76d4722e0 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Oct 2005, PHP 5.1 Release Candidate 4 +- Fixed bug #34905 (Digest authentication does not work with Apache 1). (Ilia) - Fixed bug #34902 (mysqli::character_set_name() - undefined method). (Tony) - Fixed bug #34899 (Fixed sqlite extension compile failure). ?(Ilia) - Fixed bug #33829 (mime_content_type() returns text/plain for gzip and bzip files). (Derick) diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c index 7d1078a20d0..b112d7162a5 100644 --- a/sapi/apache/mod_php5.c +++ b/sapi/apache/mod_php5.c @@ -501,9 +501,9 @@ static void init_request_info(TSRMLS_D) SG(request_info).auth_user = NULL; SG(request_info).auth_password = NULL; - if (authorization - && (!PG(safe_mode) || (PG(safe_mode) && !auth_type(r)))) { - if (!strcasecmp(getword(r->pool, &authorization, ' '), "Basic")) { + if (authorization && (!PG(safe_mode) || (PG(safe_mode) && !auth_type(r)))) { + char *p = getword(r->pool, &authorization, ' '); + if (!strcasecmp(p, "Basic")) { tmp = uudecode(r->pool, authorization); tmp_user = getword_nulls_nc(r->pool, &tmp, ':'); if (tmp_user) { @@ -514,9 +514,9 @@ static void init_request_info(TSRMLS_D) if (tmp) { SG(request_info).auth_password = estrdup(tmp); } - } else if (!strcasecmp(getword(r->pool, &authorization, ' '), "Digest")) { - r->connection->ap_auth_type = "Digest"; - SG(request_info).auth_digest = estrdup(authorization); + } else if (!strcasecmp(p, "Digest")) { + r->connection->ap_auth_type = "Digest"; + SG(request_info).auth_digest = estrdup(authorization); } } }