summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2006-08-07 13:35:50 (UTC)
committer Michael Krelin <hacker@klever.net>2006-08-07 13:35:50 (UTC)
commit048b283417574ab29fa28a44e1cedb2c76a2e327 (patch) (side-by-side diff)
treea5d8968bf9db19f5a177586c513ab28559f56d27
parent621221c40a42683a185b15b99c03fd6c8b6f7d90 (diff)
downloadsitecing-048b283417574ab29fa28a44e1cedb2c76a2e327.zip
sitecing-048b283417574ab29fa28a44e1cedb2c76a2e327.tar.gz
sitecing-048b283417574ab29fa28a44e1cedb2c76a2e327.tar.bz2
added SITECING_COMPONENT_PATH meta variable
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/sitecing-fastcgi.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/sitecing-fastcgi.cc b/src/sitecing-fastcgi.cc
index 03587aa..d8f18a6 100644
--- a/src/sitecing-fastcgi.cc
+++ b/src/sitecing-fastcgi.cc
@@ -158,48 +158,49 @@ void sitecing_fastcgi_pm::process(int slot) {
sl.lock();
}
sslot->state = scoreboard_slot::state_accept;
fcgi_interface fi(fs);
sslot->state = scoreboard_slot::state_processing;
if(multi)
sl.unlock();
cgi_gateway gw(fi);
scif.prepare(&gw);
try {
component_path = konforka::normalize_path(gw.path_info(),konforka::strip_leading_slash|konforka::strip_trailing_slash);
string full_component_path;
string sitecing_path_info;
while(true) {
full_component_path = config.root_source+'/'+component_path;
if(!access(full_component_path.c_str(),F_OK))
break;
string::size_type sl = component_path.rfind('/');
if(sl==string::npos)
throw konforka::exception(CODEPOINT,"can't find the target component");
sitecing_path_info.insert(0,component_path,sl,string::npos);
component_path.erase(sl);
}
fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info;
+ fi.metavars["SITECING_COMPONENT_PATH"]=component_path;
action = component_path;
action_handler = config.lookup_action_handler(component_path);
if(action_handler) {
action = action_handler->action;
}
string pwd = konforka::dir_name(full_component_path);
if(chdir(pwd.c_str()))
throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory");
so_component soc = ss.fetch(action,&scif);
if(action_handler) {
soc.ac->run(__magic_action,
config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(),
&(action_handler->args)
);
}else{
soc.ac->main(0,NULL);
}
}catch(http_status& hs) {
scif.headers["Status"] = hs.status+" "+hs.message;
string hshp = config.lookup_http_status_handler(component_path,hs.status);
if(!hshp.empty()) {
so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status
hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(),
config.root_so.c_str(),action.c_str(),&hs);