summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2005-03-31 22:09:50 (UTC)
committer Michael Krelin <hacker@klever.net>2005-03-31 22:09:50 (UTC)
commit986589d804cf07f58b0b9b8786267bf9032d231c (patch) (side-by-side diff)
tree0cbf7e440ecd27d9a28fb73ec718241ef1082d7d
parent185d182cd6d3e0593a3627837f3bb400b654e602 (diff)
downloadsitecing-986589d804cf07f58b0b9b8786267bf9032d231c.zip
sitecing-986589d804cf07f58b0b9b8786267bf9032d231c.tar.gz
sitecing-986589d804cf07f58b0b9b8786267bf9032d231c.tar.bz2
made use of recenly introduced cgi_interface::path_info() function
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/sitecing-fastcgi.cc2
-rw-r--r--src/sitecing-plaincgi.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sitecing-fastcgi.cc b/src/sitecing-fastcgi.cc
index 963c257..9c0d7d1 100644
--- a/src/sitecing-fastcgi.cc
+++ b/src/sitecing-fastcgi.cc
@@ -144,49 +144,49 @@ void sitecing_fastcgi_pm::process(int slot) {
sitespace ss(config);
fcgi_socket& fs = *fss;
sitecing_interface_cgi scif(&ss);
string component_path;
string action;
config_options::action_handler_t *action_handler;
int rpc = 0;
if(config.flags&configuration::flag_requests_per_child)
rpc = config.requests_per_child;
for(int req=0;(rpc<=0) || (req<rpc);rpc++) {
semaphore_lock sl;
if(multi) {
sslot->state = scoreboard_slot::state_idle;
sl.sem = &sem;
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 = normalize_path(gw.get_meta("PATH_INFO"),strip_leading_slash|strip_trailing_slash);
+ component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash);
string full_component_path;
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");
component_path.erase(sl);
}
action = component_path;
action_handler = config.lookup_action_handler(component_path);
if(action_handler) {
action = action_handler->action;
}
string pwd = 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)
);
diff --git a/src/sitecing-plaincgi.cc b/src/sitecing-plaincgi.cc
index 1cd99ac..6e8a215 100644
--- a/src/sitecing-plaincgi.cc
+++ b/src/sitecing-plaincgi.cc
@@ -29,49 +29,49 @@ using namespace sitecing;
#define PCOPY "Copyright (c) 2005 Klever Group"
class cdummyClass : public acomponent {
public:
void main(int _magic,va_list _args) {}
void *__the_most_derived_this() { return NULL; }
} cdummyInstance;
class adummyClass : public cgi_component {
public:
void main(int _magic,va_list _args) {}
void *__the_most_derived_this() { return NULL; }
} adummyInstance;
void process_request(configuration& config) {
try {
sitespace ss(config);
sitecing_interface_cgi scif(&ss);
string component_path;
string action;
config_options::action_handler_t *action_handler;
plaincgi_interface ci;
cgi_gateway gw(ci);
scif.prepare(&gw);
try {
- component_path = normalize_path(gw.get_meta("PATH_INFO"),strip_leading_slash|strip_trailing_slash);
+ component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash);
string full_component_path;
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");
component_path.erase(sl);
}
action = component_path;
action_handler = config.lookup_action_handler(component_path);
if(action_handler) {
action = action_handler->action;
}
string pwd = 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)
);