Re-apply

horde · Mar 3, 2014 · 996d537 · 996d537
1 parent 3a88697
commit 996d537
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/framework/Dav/package.xml b/framework/Dav/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
  <notes>
-* [jan] Update to SabreDAV 1.8.8.
+* [jan] Update to SabreDAV 1.8.9.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">

diff --git a/framework/Dav/vendor/sabre/dav/lib/Sabre/DAV/URLUtil.php b/framework/Dav/vendor/sabre/dav/lib/Sabre/DAV/URLUtil.php
@@ -33,7 +33,7 @@ class URLUtil {
      */
     static function encodePath($path) {
 
-        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/:])/',function($match) {
+        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/:@])/',function($match) {
 
             return '%'.sprintf('%02x',ord($match[0]));
 
@@ -51,7 +51,7 @@ static function encodePath($path) {
      */
     static function encodePathSegment($pathSegment) {
 
-        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\):])/',function($match) {
+        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\):@])/',function($match) {
 
             return '%'.sprintf('%02x',ord($match[0]));