MFH: Fixed bug #34905 (Digest authentication does not work with Apache 1).

This commit is contained in:
Ilia Alshanetsky 2005-10-18 23:15:28 +00:00
parent cbb928b8eb
commit 24046edbbb
2 changed files with 7 additions and 6 deletions

1
NEWS
View File

@ -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)

View File

@ -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);
}
}
}