Fixed URLs with +'s not downloading from CDN.

M cfnetwork.diff

git-svn-id: http://svn.telesphoreo.org/trunk@414 514c082c-b64e-11dc-b46d-3d985efe055d

diff --git a/methods/http.cc b/methods/http.cc
index eb39da73ff76ab1a3298be4ee32082080993797d..b512c5cb3fbe8c074c7300a30406695cca338b8e 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1127,6 +1127,14 @@ int HttpMethod::Loop()
 
       std::string urs = uri;
 
+      for (;;) {
+         size_t bad = urs.find_first_of("+");
+         if (bad == std::string::npos)
+            break;
+         // XXX: generalize
+         urs = urs.substr(0, bad) + "%2b" + urs.substr(bad + 1);
+      }
+
       CFStringRef sr = CFStringCreateWithCString(kCFAllocatorDefault, urs.c_str(), se);
       CFURLRef ur = CFURLCreateWithString(kCFAllocatorDefault, sr, NULL);
       CFRelease(sr);

diff --git a/methods/http.cc.orig b/methods/http.cc.orig
index 650bad052a21cc2fae8c783ae20b647f4b49b29e..75930cab37cd276647215a81326430c1cf3e7366 100644 (file)
--- a/methods/http.cc.orig
+++ b/methods/http.cc.orig
@@ -1123,6 +1123,14 @@ int HttpMethod::Loop()
 
       std::string urs = uri;
 
+      for (;;) {
+         size_t bad = urs.find_first_of("+");
+         if (bad == std::string::npos)
+            break;
+         // XXX: generalize
+         urs = urs.substr(0, bad) + "%2b" + urs.substr(bad + 1);
+      }
+
       CFStringRef sr = CFStringCreateWithCString(kCFAllocatorDefault, urs.c_str(), se);
       CFURLRef ur = CFURLCreateWithString(kCFAllocatorDefault, sr, NULL);
       CFRelease(sr);