Working queue and chat components. Added a few useful start/stop scripts. Fixed lifecycle code to call start/stop/restart functions before APR pools are cleaned up in both parent and child processes. Minor build script improvements.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@910819 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 4 deletions

diff --git a/sca-cpp/trunk/modules/http/curl.hpp b/sca-cpp/trunk/modules/http/curl.hpp
index 4e96411ec6..f2c9458f42 100644
--- a/sca-cpp/trunk/modules/http/curl.hpp
+++ b/sca-cpp/trunk/modules/http/curl.hpp
@@ -252,7 +252,7 @@ const failable<value> entryId(const failable<string> l) {
     if (!hasContent(l))
         return mkfailure<value>(reason(l));
     const string ls(content(l));
-    return value(string(substr(ls, find_last(ls, '/') + 1)));
+    return value(mklist<value>(string(substr(ls, find_last(ls, '/') + 1))));
 }
 
 /**
@@ -381,18 +381,18 @@ const failable<value, string> del(const string& url, const CURLSession& ch) {
  * HTTP client proxy function.
  */
 struct proxy {
-    proxy(const string& url) : url(url) {
+    proxy(const string& uri) : uri(uri) {
     }
 
     const value operator()(const list<value>& args) const {
         CURLSession cs;
-        failable<value> val = evalExpr(args, url, cs);
+        failable<value> val = evalExpr(args, uri, cs);
         if (!hasContent(val))
             return value();
         return content(val);
     }
 
-    const string url;
+    const string uri;
 };
 
 }