Minor tweaks to make the OAuth support work with Github.

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

2 files changed, 10 insertions, 3 deletions

diff --git a/sca-cpp/trunk/modules/http/http.hpp b/sca-cpp/trunk/modules/http/http.hpp
index 1932ac3420..db860aeee2 100644
--- a/sca-cpp/trunk/modules/http/http.hpp
+++ b/sca-cpp/trunk/modules/http/http.hpp
@@ -419,7 +419,7 @@ const failable<value> get(const string& url, const CURLSession& cs) {
         debug(val, "http::get::result");
         return val;
     }
-    if (contains(ct, "text/javascript") || contains(ct, "application/json-rpc")) {
+    if (contains(ct, "text/javascript") || contains(ct, "application/json")) {
         json::JSONContext cx;
         const value val(json::jsonValues(content(json::readJSON(ls, cx))));
         debug(val, "http::get::result");
diff --git a/sca-cpp/trunk/modules/http/httpd.hpp b/sca-cpp/trunk/modules/http/httpd.hpp
index f407e1012e..870aed71b7 100644
--- a/sca-cpp/trunk/modules/http/httpd.hpp
+++ b/sca-cpp/trunk/modules/http/httpd.hpp
@@ -204,7 +204,7 @@ const string url(const string& uri, request_rec* r) {
 /**
  * Escape a URI.
  */
-const char escape_c2x[] = "0123456789abcdef";
+const char escape_c2x[] = "0123456789ABCDEF";
 const string escape(const string& uri) {
     debug(uri, "httpd::escape::uri");
     char* copy = (char*)apr_palloc(gc_current_pool(), 3 * length(uri) + 3);
@@ -248,8 +248,15 @@ const list<value> queryArg(const string& s) {
     return mklist<value>(c_str(car(t)), cadr(t));
 }
 
+const string fixupQueryArgs(const string& a) {
+    const list<string> t = tokenize("?", a);
+    if (isNil(t) || isNil(cdr(t)))
+        return a;
+    return join("&", t);
+}
+
 const list<list<value> > queryArgs(const string& a) {
-    return map<string, list<value>>(queryArg, tokenize("&", a));
+    return map<string, list<value>>(queryArg, tokenize("&", fixupQueryArgs(a)));
 }
 
 /**