cvs: php-src(PHP_5_1) / NEWS /sapi/apache mod_php5.c

iliaa Tue Oct 18 19:15:29 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/sapi/apache mod_php5.c /php-src NEWS Log: MFH: Fixed bug #34905 (Digest authentication does not work with Apache 1). http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.19&r2=1.19.2.1&ty=u Index: php-src/sapi/apache/mod_php5.c diff -u php-src/sapi/apache/mod_php5.c:1.19 php-src/sapi/apache/mod_php5.c:1.19.2.1 --- php-src/sapi/apache/mod_php5.c:1.19 Wed Aug 3 10:08:45 2005 +++ php-src/sapi/apache/mod_php5.c Tue Oct 18 19:15:28 2005 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php5.c,v 1.19 2005/08/03 14:08:45 sniper Exp $ */ +/* $Id: mod_php5.c,v 1.19.2.1 2005/10/18 23:15:28 iliaa Exp $ */ #include "php_apache_http.h" #include "http_conf_globals.h" @@ -501,9 +501,9 @@ 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 @@ 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); } } } http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.139&r2=1.2027.2.140&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.139 php-src/NEWS:1.2027.2.140 --- php-src/NEWS:1.2027.2.139 Tue Oct 18 11:04:04 2005 +++ php-src/NEWS Tue Oct 18 19:15:28 2005 @@ -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)