-rw-r--r-- | src/sitecing-fastcgi.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/sitecing-fastcgi.cc b/src/sitecing-fastcgi.cc index 9c0d7d1..756dcee 100644 --- a/src/sitecing-fastcgi.cc +++ b/src/sitecing-fastcgi.cc | |||
@@ -146,57 +146,60 @@ void sitecing_fastcgi_pm::process(int slot) { | |||
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);rpc++) { |
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 = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash); | 168 | component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash); |
169 | string full_component_path; | 169 | string full_component_path; |
170 | string sitecing_path_info; | ||
170 | while(true) { | 171 | while(true) { |
171 | full_component_path = config.root_source+'/'+component_path; | 172 | full_component_path = config.root_source+'/'+component_path; |
172 | if(!access(full_component_path.c_str(),F_OK)) | 173 | if(!access(full_component_path.c_str(),F_OK)) |
173 | break; | 174 | break; |
174 | string::size_type sl = component_path.rfind('/'); | 175 | string::size_type sl = component_path.rfind('/'); |
175 | if(sl==string::npos) | 176 | if(sl==string::npos) |
176 | 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); | ||
177 | component_path.erase(sl); | 179 | component_path.erase(sl); |
178 | } | 180 | } |
181 | fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info; | ||
179 | action = component_path; | 182 | action = component_path; |
180 | action_handler = config.lookup_action_handler(component_path); | 183 | action_handler = config.lookup_action_handler(component_path); |
181 | if(action_handler) { | 184 | if(action_handler) { |
182 | action = action_handler->action; | 185 | action = action_handler->action; |
183 | } | 186 | } |
184 | string pwd = dir_name(full_component_path); | 187 | string pwd = dir_name(full_component_path); |
185 | if(chdir(pwd.c_str())) | 188 | if(chdir(pwd.c_str())) |
186 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); | 189 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); |
187 | so_component soc = ss.fetch(action,&scif); | 190 | so_component soc = ss.fetch(action,&scif); |
188 | if(action_handler) { | 191 | if(action_handler) { |
189 | soc.ac->run(__magic_action, | 192 | soc.ac->run(__magic_action, |
190 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), | 193 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), |
191 | &(action_handler->args) | 194 | &(action_handler->args) |
192 | ); | 195 | ); |
193 | }else{ | 196 | }else{ |
194 | soc.ac->main(0,NULL); | 197 | soc.ac->main(0,NULL); |
195 | } | 198 | } |
196 | }catch(http_status& hs) { | 199 | }catch(http_status& hs) { |
197 | scif.headers["Status"] = hs.status+" "+hs.message; | 200 | scif.headers["Status"] = hs.status+" "+hs.message; |
198 | string hshp = config.lookup_http_status_handler(component_path,hs.status); | 201 | string hshp = config.lookup_http_status_handler(component_path,hs.status); |
199 | if(!hshp.empty()) { | 202 | if(!hshp.empty()) { |
200 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status | 203 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status |
201 | hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(), | 204 | hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(), |
202 | config.root_so.c_str(),action.c_str(),&hs); | 205 | config.root_so.c_str(),action.c_str(),&hs); |