summaryrefslogtreecommitdiffabout
Unidiff
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)
121 if(pf) { 121 if(pf) {
122 die_humbly=true; 122 die_humbly=true;
123 _exit(0); 123 _exit(0);
124 } 124 }
125 } 125 }
126 if(config.flags&configuration::flag_pid_file) { 126 if(config.flags&configuration::flag_pid_file) {
127 pidfile.set(config.pid_file); 127 pidfile.set(config.pid_file);
128 } 128 }
129 if(multi) 129 if(multi)
130 sem.init(); 130 sem.init();
131 } 131 }
132sitecing_fastcgi_pm::~sitecing_fastcgi_pm() { 132sitecing_fastcgi_pm::~sitecing_fastcgi_pm() {
133 if(fss) 133 if(fss)
134 delete fss; 134 delete fss;
135} 135}
136 136
137void sitecing_fastcgi_pm::process(int slot) { 137void sitecing_fastcgi_pm::process(int slot) {
138 signal(SIGINT,SIG_DFL); 138 signal(SIGINT,SIG_DFL);
139 signal(SIGABRT,SIG_DFL); 139 signal(SIGABRT,SIG_DFL);
140 signal(SIGTERM,SIG_DFL); 140 signal(SIGTERM,SIG_DFL);
141 give_up_privs(); 141 give_up_privs();
142 scoreboard_slot *sslot = sboard.get_slot(slot); 142 scoreboard_slot *sslot = sboard.get_slot(slot);
143 try { 143 try {
144 sitespace ss(config); 144 sitespace ss(config);
145 fcgi_socket& fs = *fss; 145 fcgi_socket& fs = *fss;
146 sitecing_interface_cgi scif(&ss); 146 sitecing_interface_cgi scif(&ss);
147 string component_path; 147 string component_path;
148 string action; 148 string action;
149 config_options::action_handler_t *action_handler; 149 config_options::action_handler_t *action_handler;
150 int rpc = 0; 150 int rpc = 0;
151 if(config.flags&configuration::flag_requests_per_child) 151 if(config.flags&configuration::flag_requests_per_child)
152 rpc = config.requests_per_child; 152 rpc = config.requests_per_child;
153 for(int req=0;(rpc<=0) || (req<rpc);rpc++) { 153 for(int req=0;(rpc<=0) || (req<rpc);++req) {
154 semaphore_lock sl; 154 semaphore_lock sl;
155 if(multi) { 155 if(multi) {
156 sslot->state = scoreboard_slot::state_idle; 156 sslot->state = scoreboard_slot::state_idle;
157 sl.sem = &sem; 157 sl.sem = &sem;
158 sl.lock(); 158 sl.lock();
159 } 159 }
160 sslot->state = scoreboard_slot::state_accept; 160 sslot->state = scoreboard_slot::state_accept;
161 fcgi_interface fi(fs); 161 fcgi_interface fi(fs);
162 sslot->state = scoreboard_slot::state_processing; 162 sslot->state = scoreboard_slot::state_processing;
163 if(multi) 163 if(multi)
164 sl.unlock(); 164 sl.unlock();
165 cgi_gateway gw(fi); 165 cgi_gateway gw(fi);
166 scif.prepare(&gw); 166 scif.prepare(&gw);
167 try { 167 try {
168 component_path = konforka::normalize_path(gw.path_info(),konforka::strip_leading_slash|konforka::strip_trailing_slash); 168 component_path = konforka::normalize_path(gw.path_info(),konforka::strip_leading_slash|konforka::strip_trailing_slash);
169 string full_component_path; 169 string full_component_path;
170 string sitecing_path_info; 170 string sitecing_path_info;
171 while(true) { 171 while(true) {
172 full_component_path = config.root_source+'/'+component_path; 172 full_component_path = config.root_source+'/'+component_path;
173 if(!access(full_component_path.c_str(),F_OK)) 173 if(!access(full_component_path.c_str(),F_OK))
174 break; 174 break;
175 string::size_type sl = component_path.rfind('/'); 175 string::size_type sl = component_path.rfind('/');
176 if(sl==string::npos) 176 if(sl==string::npos)
177 throw konforka::exception(CODEPOINT,"can't find the target component"); 177 throw konforka::exception(CODEPOINT,"can't find the target component");
178 sitecing_path_info.insert(0,component_path,sl,string::npos); 178 sitecing_path_info.insert(0,component_path,sl,string::npos);
179 component_path.erase(sl); 179 component_path.erase(sl);
180 } 180 }
181 fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info; 181 fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info;
182 fi.metavars["SITECING_COMPONENT_PATH"]=component_path; 182 fi.metavars["SITECING_COMPONENT_PATH"]=component_path;
183 action = component_path; 183 action = component_path;
184 action_handler = config.lookup_action_handler(component_path); 184 action_handler = config.lookup_action_handler(component_path);
185 if(action_handler) { 185 if(action_handler) {