summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/sitecing-fastcgi.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sitecing-fastcgi.cc b/src/sitecing-fastcgi.cc
index d8f18a6..57aba60 100644
--- a/src/sitecing-fastcgi.cc
+++ b/src/sitecing-fastcgi.cc
@@ -121,65 +121,65 @@ sitecing_fastcgi_pm::sitecing_fastcgi_pm(const string& config_file)
if(pf) {
die_humbly=true;
_exit(0);
}
}
if(config.flags&configuration::flag_pid_file) {
pidfile.set(config.pid_file);
}
if(multi)
sem.init();
}
sitecing_fastcgi_pm::~sitecing_fastcgi_pm() {
if(fss)
delete fss;
}
void sitecing_fastcgi_pm::process(int slot) {
signal(SIGINT,SIG_DFL);
signal(SIGABRT,SIG_DFL);
signal(SIGTERM,SIG_DFL);
give_up_privs();
scoreboard_slot *sslot = sboard.get_slot(slot);
try {
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++) {
+ for(int req=0;(rpc<=0) || (req<rpc);++req) {
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 = 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) {