cvs: pear /HTTP_WebDAV_Server Server.php
| From: | Hartmut Holzgraefe | Date: | Wed, 01 Mar 2006 15:34:17 +0000 |
| Subject: | cvs: pear /HTTP_WebDAV_Server Server.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-38789@lists.php.net to get a copy of this message | ||
hholzgra Wed Mar 1 15:34:17 2006 UTC
Modified files:
/pear/HTTP_WebDAV_Server Server.php
Log:
attempt to fix PEAR bug #5363 without compromising too much security
http://cvs.php.net/viewcvs.cgi/pear/HTTP_WebDAV_Server/Server.php?r1=1.42&r2=1.43&diff_format=u
Index: pear/HTTP_WebDAV_Server/Server.php
diff -u pear/HTTP_WebDAV_Server/Server.php:1.42 pear/HTTP_WebDAV_Server/Server.php:1.43
--- pear/HTTP_WebDAV_Server/Server.php:1.42 Wed Mar 1 02:58:59 2006
+++ pear/HTTP_WebDAV_Server/Server.php Wed Mar 1 15:34:17 2006
@@ -17,7 +17,7 @@
// | Christian Stocker <chregu@bitflux.ch> |
// +----------------------------------------------------------------------+
//
-// $Id: Server.php,v 1.42 2006/03/01 02:58:59 hholzgra Exp $
+// $Id: Server.php,v 1.43 2006/03/01 15:34:17 hholzgra Exp $
//
require_once "HTTP/WebDAV/Tools/_parse_propfind.php";
require_once "HTTP/WebDAV/Tools/_parse_proppatch.php";
@@ -161,7 +161,10 @@
}
// check authentication
- if (!$this->_check_auth()) {
+ // for the motivation for not checking OPTIONS requests on / see
+ // http://pear.php.net/bugs/bug.php?id=5363
+ if ( ( !(($_SERVER['REQUEST_METHOD'] == 'OPTIONS') &&
($this->path == "/")))
+ && (!$this->_check_auth())) {
// RFC2518 says we must use Digest instead of Basic
// but Microsoft Clients do not support Digest
// and we don't support NTLM and Kerberos