[jan] Detect REPORT queries as DAV requests in RPC server (Bug #13124).

Conflicts: horde/docs/CHANGES horde/package.xml
horde · Apr 22, 2014 · 295eebd · 295eebd
1 parent e968a54
commit 295eebd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/horde/package.xml b/horde/package.xml
@@ -3842,6 +3842,8 @@
    <date>2014-03-07</date>
    <license uri="http://www.horde.org/licenses/lgpl">LGPL-2</license>
    <notes>
+* [jan] Detect REPORT queries as DAV requests in RPC server (Bug #13124).
+* [jan] Fix fatal error in LDAP account portal block (Bug #12910).
 * [jan] Update Korean translation (Deokgon Kim &lt;dgkim@dgkim.net&gt;).
    </notes>
   </release>

diff --git a/horde/rpc.php b/horde/rpc.php
@@ -42,7 +42,7 @@
     $cache_control = 'private';
     $no_notification = true;
 } elseif (!empty($_SERVER['PATH_INFO']) ||
-          in_array($_SERVER['REQUEST_METHOD'], array('DELETE', 'PROPFIND', 'PUT', 'OPTIONS'))) {
+          in_array($_SERVER['REQUEST_METHOD'], array('DELETE', 'PROPFIND', 'PUT', 'OPTIONS', 'REPORT'))) {
     $serverType = 'Webdav';
 } elseif (!empty($_SERVER['CONTENT_TYPE'])) {
     if (strpos($_SERVER['CONTENT_TYPE'], 'application/vnd.syncml+xml') !== false) {