[jan] Fix DAV client always using Digest authentication (Bug #13319).

horde · Nov 21, 2014 · d4d1334 · d4d1334
1 parent 55a38d6
commit d4d1334
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/framework/Dav/lib/Horde/Dav/Client.php b/framework/Dav/lib/Horde/Dav/Client.php
@@ -82,11 +82,16 @@ public function request($method, $url = '', $body = null, $headers = array())
             $this->_http->{'request.proxyServer'} = $this->proxy;
         }
         if ($this->userName && $this->authType) {
-            if ($this->authType & self::AUTH_BASIC) {
+            switch ($this->authType) {
+            case self::AUTH_BASIC:
                 $this->_http->{'request.authenticationScheme'} = Horde_Http::AUTH_BASIC;
-            }
-            if ($this->authType & self::AUTH_DIGEST) {
+                break;
+            case self::AUTH_DIGEST:
                 $this->_http->{'request.authenticationScheme'} = Horde_Http::AUTH_DIGEST;
+                break;
+            default:
+                $this->_http->{'request.authenticationScheme'} = Horde_Http::AUTH_ANY;
+                break;
             }
             $this->_http->{'request.username'} = $this->userName;
             $this->_http->{'request.password'} = $this->password;

diff --git a/framework/Dav/package.xml b/framework/Dav/package.xml
@@ -21,6 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
  <notes>
+* [jan] Fix DAV client always using Digest authentication (Bug #13319).
 * [jan] Fix PUT request not passing content to the backend.
  </notes>
  <contents>
@@ -842,6 +843,7 @@
    <date>2014-10-29</date>
    <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
    <notes>
+* [jan] Fix DAV client always using Digest authentication (Bug #13319).
 * [jan] Fix PUT request not passing content to the backend.
    </notes>
   </release>