summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/server/mod-wiring.cpp
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-05-23 06:50:15 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2011-05-23 06:50:15 +0000
commit2faafb710633884260b070e1d4ed4ef46326612a (patch)
treedeea4d9ecb9e799fcd28900a1b76c6c0bce01cbf /sca-cpp/trunk/modules/server/mod-wiring.cpp
parent8f252e970a8b3584d3f566dba619b79d70b5efcf (diff)
Support cookies over outgoing HTTP calls and a shorter component URL addressing scheme.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1126336 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sca-cpp/trunk/modules/server/mod-wiring.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/sca-cpp/trunk/modules/server/mod-wiring.cpp b/sca-cpp/trunk/modules/server/mod-wiring.cpp
index 8bc4504155..b1a8047525 100644
--- a/sca-cpp/trunk/modules/server/mod-wiring.cpp
+++ b/sca-cpp/trunk/modules/server/mod-wiring.cpp
@@ -33,6 +33,7 @@
#include "value.hpp"
#include "monad.hpp"
#include "../scdl/scdl.hpp"
+#include "../http/http.hpp"
#include "../http/httpd.hpp"
extern "C" {
@@ -292,7 +293,7 @@ const failable<bool> virtualHostConfig(ServerConf& sc, request_rec* r) {
// Resolve the configured virtual contribution under
// the virtual host's SCA contribution root
- sc.contributionPath = sc.virtualHostContributionPath + httpd::subdomain(httpd::hostName(r)) + "/";
+ sc.contributionPath = sc.virtualHostContributionPath + http::subDomain(httpd::hostName(r)) + "/";
sc.compositeName = sc.virtualHostCompositeName;
// Configure the wiring for the deployed components
@@ -309,7 +310,7 @@ int translate(request_rec *r) {
return DECLINED;
// No translation needed for a component or tunnel request
- if (!strncmp(r->uri, "/components/", 12))
+ if (!strncmp(r->uri, "/components/", 12) || !strncmp(r->uri, "/c/", 3))
return DECLINED;
// Create a scoped memory pool
@@ -328,7 +329,7 @@ int translate(request_rec *r) {
}
// Translate a component reference request
- if (!strncmp(r->uri, "/references/", 12))
+ if (!strncmp(r->uri, "/references/", 12) || !strncmp(r->uri, "/r/", 3))
return translateReference(usevh? vhc.sc: sc, r);
// Translate a service request