From 1a01ce4fe5882fcc5b312172d7fdf409e0cb9765 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 20 Feb 2012 07:20:38 +0000
Subject: Fixes to the hosting module to correctly store ATOM feeds instead of
 raw collections and work with the sqldb component.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1291136 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-cpp/trunk/modules/http/Makefile.am | 2 +-
 sca-cpp/trunk/modules/http/http.hpp    | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'sca-cpp/trunk/modules/http')

diff --git a/sca-cpp/trunk/modules/http/Makefile.am b/sca-cpp/trunk/modules/http/Makefile.am
index 846c8ac6cc..2cbbfdbad7 100644
--- a/sca-cpp/trunk/modules/http/Makefile.am
+++ b/sca-cpp/trunk/modules/http/Makefile.am
@@ -20,7 +20,7 @@ INCLUDES = -I${HTTPD_INCLUDE}
 incl_HEADERS = *.hpp
 incldir = $(prefix)/include/modules/http
 
-dist_mod_SCRIPTS = httpd-conf httpd-addr httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf ssl-cert-find httpd-ssl-conf basic-auth-conf cert-auth-conf form-auth-conf open-auth-conf passwd-auth-conf group-auth-conf proxy-conf proxy-ssl-conf proxy-member-conf proxy-ssl-member-conf proxy-ssl-nossl-member-conf vhost-conf vhost-ssl-conf tunnel-ssl-conf httpd-worker-conf httpd-event-conf minify-html minify-js minify-css
+dist_mod_SCRIPTS = httpd-conf httpd-addr httpd-start httpd-stop httpd-restart ssl-ca-conf ssl-cert-conf ssl-cert-find httpd-ssl-conf basic-auth-conf cert-auth-conf form-auth-conf open-auth-conf passwd-auth-conf group-auth-conf proxy-conf proxy-ssl-conf proxy-member-conf proxy-ssl-member-conf proxy-ssl-nossl-member-conf vhost-conf vhost-ssl-conf tunnel-ssl-conf httpd-worker-conf httpd-event-conf httpd-loglevel-conf minify-html minify-js minify-css
 moddir = $(prefix)/modules/http
 
 curl_test_SOURCES = curl-test.cpp
diff --git a/sca-cpp/trunk/modules/http/http.hpp b/sca-cpp/trunk/modules/http/http.hpp
index 530f3c0c5c..0b4c9f6822 100644
--- a/sca-cpp/trunk/modules/http/http.hpp
+++ b/sca-cpp/trunk/modules/http/http.hpp
@@ -634,7 +634,7 @@ const failable<list<list<string> > > contentRequest(const value& c, unused const
     if (isString(car<value>(c)) && !isNil(cdr<value>(c)) && isList(cadr<value>(c)))
         return writeRequest(convertValues<string>(cadr<value>(c)), car<value>(c));
 
-    // Write an assoc value as a JSON result
+    // Write an assoc value as JSON
     if (isSymbol(car<value>(c)) && !isNil(cdr<value>(c))) {
         js::JSContext cx;
         const list<value> lc = mklist<value>(c);
@@ -888,7 +888,7 @@ const string queryString(const list<list<value> > args) {
  * Filter path segment in a list of arguments.
  */
 const bool filterPath(const value& arg) {
-    return isString(arg);
+    return isString(arg) || isSymbol(arg);
 }
 
 /**
@@ -914,11 +914,13 @@ struct proxy {
     }
     
     const value operator()(const list<value>& args) const {
+        debug(args, "http::proxy::args");
         const value fun = car(args);
         if (fun == "get") {
             const list<value> lp = filter<value>(filterPath, cadr(args));
-            debug(lp, "http::queryString::arg");
+            debug(lp, "http::proxy::path");
             const list<value> lq = map<value, value>(escapeQuery, filter<value>(filterQuery, cadr(args)));
+            debug(lp, "http::proxy::query");
             const value p = path(lp);
             const value q = queryString(lq);
             const failable<value> val = get(uri + p + (q != ""? string("?") + q : string("")), cs);
-- 
cgit v1.2.3