do not escape URL safe chars (like @ or .)

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@232 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog
index dc065ce94e06d17a08d5c9431d1bbb94f351d644..2e5e7d23e68e20d9df30bc5b63bcec7630d9e968 100644 (file)
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-08  Helge Hess  <helge.hess@opengroupware.org>
+
+       * FdExt.subproj/NSString+URLEscaping.m: do not escape URL safe chars
+         (fixes a WebDAV issue with Cadaver) (v4.3.121)
+
 2004-10-04  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * NGExtensions.xcode: updated to the current build version

diff --git a/sope-core/NGExtensions/FdExt.subproj/NSString+URLEscaping.m b/sope-core/NGExtensions/FdExt.subproj/NSString+URLEscaping.m
index f6d30d738a712827d437ef9c4ac9d652f93dd207..5e2de3d31a927ba43c4bb662f81ffc7eafb2db45 100644 (file)
--- a/sope-core/NGExtensions/FdExt.subproj/NSString+URLEscaping.m
+++ b/sope-core/NGExtensions/FdExt.subproj/NSString+URLEscaping.m
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -18,11 +18,17 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
+// $Id: NSString+URLEscaping.m 1 2004-08-20 10:08:27Z znek $
 
 #include "NSString+misc.h"
 #include "common.h"
 
+/*
+  TODO: support new Panther API?:
+- (NSString *)stringByAddingPercentEscapesUsingEncoding:(NSStringEncoding)e
+- (NSString *)stringByReplacingPercentEscapesUsingEncoding:(NSStringEncoding)e
+*/
+
 @implementation NSString(URLEscaping)
 
 static int useUTF8Encoding = -1;
@@ -102,7 +108,7 @@ static inline BOOL isUrlAlphaNum(unsigned char _c) {
 }
 
 static inline BOOL isToBeEscaped(unsigned char _c) {
-  return (isUrlAlphaNum(_c) || (_c == '_')) ? NO : YES;
+  return (isUrlAlphaNum(_c) || (_c == '_') || isUrlSafeChar(_c)) ? NO : YES;
 }
 
 static void

diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version
index bf24f267543e11c01b20cbe7e42433f19cefea8e..bebec1470707cc5e0b43f35064feb7d751b587c5 100644 (file)
--- a/sope-core/NGExtensions/Version
+++ b/sope-core/NGExtensions/Version
@@ -1,6 +1,6 @@
 # version
 
-SUBMINOR_VERSION:=120
+SUBMINOR_VERSION:=121
 
 # v4.3.115 requires libFoundation v1.0.59
 # v4.2.72  requires libEOControl  v4.2.39