Update SabreDAV to 1.7.11

owncloud-archive · Feb 28, 2014 · c77c4dd · c77c4dd · LukasReschke · Feb 28, 2014
1 parent 177d3ff
commit c77c4dd
Show file tree

Hide file tree

Showing 191 changed files with 314 additions and 286 deletions.
diff --git a/autoload.php b/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit713de2d84a4eb6bdcb2d36cc7aa8f260::getLoader();
+return ComposerAutoloaderInit9cd2e48c9ff37a90f0f58c866181cdfe::getLoader();
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
 		}
 	],
 	"require": {
-		"sabre/dav" : "1.7.9",
+		"sabre/dav" : "1.7.11",
 		"mcnetic/phpzipstreamer": "dev-master",
 		"kriswallsmith/assetic": "1.2.*@dev"
 	}

diff --git a/composer.lock b/composer.lock
diff --git a/composer/autoload_real.php b/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit713de2d84a4eb6bdcb2d36cc7aa8f260
+class ComposerAutoloaderInit9cd2e48c9ff37a90f0f58c866181cdfe
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit713de2d84a4eb6bdcb2d36cc7aa8f260', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit9cd2e48c9ff37a90f0f58c866181cdfe', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit713de2d84a4eb6bdcb2d36cc7aa8f260', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit9cd2e48c9ff37a90f0f58c866181cdfe', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);
         $baseDir = $vendorDir;
@@ -45,14 +45,14 @@ public static function getLoader()
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            composerRequire713de2d84a4eb6bdcb2d36cc7aa8f260($file);
+            composerRequire9cd2e48c9ff37a90f0f58c866181cdfe($file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire713de2d84a4eb6bdcb2d36cc7aa8f260($file)
+function composerRequire9cd2e48c9ff37a90f0f58c866181cdfe($file)
 {
     require $file;
 }
diff --git a/composer/installed.json b/composer/installed.json
@@ -49,76 +49,6 @@
             "vCard"
         ]
     },
-    {
-        "name": "sabre/dav",
-        "version": "1.7.9",
-        "version_normalized": "1.7.9.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/fruux/sabre-dav.git",
-            "reference": "05ee3831e48e908041888bfdf0186bce1b7097d8"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/05ee3831e48e908041888bfdf0186bce1b7097d8",
-            "reference": "05ee3831e48e908041888bfdf0186bce1b7097d8",
-            "shasum": ""
-        },
-        "require": {
-            "ext-ctype": "*",
-            "ext-date": "*",
-            "ext-dom": "*",
-            "ext-iconv": "*",
-            "ext-libxml": "*",
-            "ext-mbstring": "*",
-            "ext-pcre": "*",
-            "ext-simplexml": "*",
-            "ext-spl": "*",
-            "php": ">=5.3.1",
-            "sabre/vobject": "~2.1.0"
-        },
-        "provide": {
-            "evert/sabredav": "1.7.*"
-        },
-        "require-dev": {
-            "phing/phing": "2.4.14",
-            "phpunit/phpunit": "3.7.*"
-        },
-        "suggest": {
-            "ext-apc": "*",
-            "ext-curl": "*",
-            "ext-pdo": "*"
-        },
-        "time": "2013-10-02 18:33:56",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Sabre": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Evert Pot",
-                "email": "evert@rooftopsolutions.nl",
-                "homepage": "http://evertpot.com/",
-                "role": "Developer"
-            }
-        ],
-        "description": "WebDAV Framework for PHP",
-        "homepage": "http://code.google.com/p/sabredav/",
-        "keywords": [
-            "CalDAV",
-            "CardDAV",
-            "WebDAV",
-            "framework",
-            "iCalendar"
-        ]
-    },
     {
         "name": "mcnetic/phpzipstreamer",
         "version": "master",
@@ -256,5 +186,75 @@
             "compression",
             "minification"
         ]
+    },
+    {
+        "name": "sabre/dav",
+        "version": "1.7.11",
+        "version_normalized": "1.7.11.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/fruux/sabre-dav.git",
+            "reference": "e3f46e0ecf83cf1d2ebf54908cde7b5ec170aa2c"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/e3f46e0ecf83cf1d2ebf54908cde7b5ec170aa2c",
+            "reference": "e3f46e0ecf83cf1d2ebf54908cde7b5ec170aa2c",
+            "shasum": ""
+        },
+        "require": {
+            "ext-ctype": "*",
+            "ext-date": "*",
+            "ext-dom": "*",
+            "ext-iconv": "*",
+            "ext-libxml": "*",
+            "ext-mbstring": "*",
+            "ext-pcre": "*",
+            "ext-simplexml": "*",
+            "ext-spl": "*",
+            "php": ">=5.3.1",
+            "sabre/vobject": "~2.1.0"
+        },
+        "provide": {
+            "evert/sabredav": "1.7.*"
+        },
+        "require-dev": {
+            "phing/phing": "2.4.14",
+            "phpunit/phpunit": "3.7.*"
+        },
+        "suggest": {
+            "ext-apc": "*",
+            "ext-curl": "*",
+            "ext-pdo": "*"
+        },
+        "time": "2014-02-26 22:13:46",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Sabre": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Evert Pot",
+                "email": "evert@rooftopsolutions.nl",
+                "homepage": "http://evertpot.com/",
+                "role": "Developer"
+            }
+        ],
+        "description": "WebDAV Framework for PHP",
+        "homepage": "http://code.google.com/p/sabredav/",
+        "keywords": [
+            "CalDAV",
+            "CardDAV",
+            "WebDAV",
+            "framework",
+            "iCalendar"
+        ]
     }
 ]
diff --git a/sabre/dav/.travis.yml b/sabre/dav/.travis.yml
@@ -4,6 +4,13 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: 5.6
+    - php: hhvm
 
 services:
   - mysql

diff --git a/sabre/dav/ChangeLog b/sabre/dav/ChangeLog
@@ -1,4 +1,14 @@
+1.7.11-stable (2014-02-26)
+	* Fixed: Issue #407: large downloads failed.
+	* Fixed: Issue #414: XXE security problem on older PHP versions.
+
+1.7.10-stable (2014-02-09)
+	* The zip release ships with sabre/vobject 2.1.3.
+	* Fixed: Potential security vulnerability in the http client.
+	* Fixed: Issue #374: Don't urlescape colon (:) when it's not required.
+
 1.7.9-stable (2013-10-02)
+	* The zip release ships with sabre/vobject 2.1.3.
 	* Fixed: Issue #365. Incorrect output when principal urls have spaces in
 	  them.
 	* Added: Issue #367: Automatically adding a UID to vcards that don't have

diff --git a/sabre/dav/LICENSE b/sabre/dav/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
 
 All rights reserved.
 

diff --git a/sabre/dav/build.xml b/sabre/dav/build.xml
@@ -14,13 +14,6 @@
         <zip destfile="build/SabreDAV-${sabredav.version}.zip" basedir="build/SabreDAV" prefix="SabreDAV/" />
     </target>
 
-    <target name="uploadzip" depends="buildzip">
-        <echo>Uploading to Google Code</echo>
-        <propertyprompt propertyName="googlecode.username" promptText="Enter your googlecode username" useExistingValue="true" />
-        <propertyprompt propertyName="googlecode.password" promptText="Enter your googlecode password" useExistingValue="true" />
-        <exec command="bin/googlecode_upload.py -s 'SabreDAV ${sabredav.version}' -p sabredav --labels=${sabredav.ucstability} -u '${googlecode.username}' -w '${googlecode.password}' build/SabreDAV-${sabredav.version}.zip" checkreturn="true" />
-    </target>
-
     <target name="clean" depends="init">
         <echo msg="Removing build files (cleaning up distribution)" />
         <delete dir="docs/api" />

diff --git a/sabre/dav/lib/Sabre/CalDAV/Backend/Abstract.php b/sabre/dav/lib/Sabre/CalDAV/Backend/Abstract.php
@@ -9,7 +9,7 @@
  *
  * @package Sabre
  * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */

diff --git a/sabre/dav/lib/Sabre/CalDAV/Backend/BackendInterface.php b/sabre/dav/lib/Sabre/CalDAV/Backend/BackendInterface.php
@@ -5,7 +5,7 @@
  *
  * @package Sabre
  * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */

diff --git a/sabre/dav/lib/Sabre/CalDAV/Backend/NotificationSupport.php b/sabre/dav/lib/Sabre/CalDAV/Backend/NotificationSupport.php
@@ -16,7 +16,7 @@
  *
  * @package Sabre
  * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */

diff --git a/sabre/dav/lib/Sabre/CalDAV/Backend/PDO.php b/sabre/dav/lib/Sabre/CalDAV/Backend/PDO.php
@@ -10,7 +10,7 @@
  *
  * @package Sabre
  * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */

diff --git a/sabre/dav/lib/Sabre/CalDAV/Backend/SharingSupport.php b/sabre/dav/lib/Sabre/CalDAV/Backend/SharingSupport.php
@@ -165,7 +165,7 @@
  *
  * @package Sabre
  * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */

diff --git a/sabre/dav/lib/Sabre/CalDAV/Calendar.php b/sabre/dav/lib/Sabre/CalDAV/Calendar.php
@@ -8,7 +8,7 @@
  *
  * @package Sabre
  * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */

diff --git a/sabre/dav/lib/Sabre/CalDAV/CalendarObject.php b/sabre/dav/lib/Sabre/CalDAV/CalendarObject.php
@@ -5,7 +5,7 @@
  *
  * @package Sabre
  * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */

diff --git a/sabre/dav/lib/Sabre/CalDAV/CalendarQueryParser.php b/sabre/dav/lib/Sabre/CalDAV/CalendarQueryParser.php
@@ -10,7 +10,7 @@
  *
  * @package Sabre
  * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */

diff --git a/sabre/dav/lib/Sabre/CalDAV/CalendarQueryValidator.php b/sabre/dav/lib/Sabre/CalDAV/CalendarQueryValidator.php
@@ -13,7 +13,7 @@
  *
  * @package Sabre
  * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */

diff --git a/sabre/dav/lib/Sabre/CalDAV/CalendarRootNode.php b/sabre/dav/lib/Sabre/CalDAV/CalendarRootNode.php
@@ -8,7 +8,7 @@
  *
  * @package Sabre
  * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */

diff --git a/sabre/dav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php b/sabre/dav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php
@@ -5,7 +5,7 @@
  *
  * @package Sabre
  * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */