summaryrefslogtreecommitdiffabout
path: root/src/sitecing-fastcgi.cc
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) (unidiff)
tree0cbf7e440ecd27d9a28fb73ec718241ef1082d7d /src/sitecing-fastcgi.cc
parent185d182cd6d3e0593a3627837f3bb400b654e602 (diff)
downloadsitecing-986589d804cf07f58b0b9b8786267bf9032d231c.zip
sitecing-986589d804cf07f58b0b9b8786267bf9032d231c.tar.gz
sitecing-986589d804cf07f58b0b9b8786267bf9032d231c.tar.bz2
made use of recenly introduced cgi_interface::path_info() function
Diffstat (limited to 'src/sitecing-fastcgi.cc') (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 963c257..9c0d7d1 100644
--- a/src/sitecing-fastcgi.cc
+++ b/src/sitecing-fastcgi.cc
@@ -144,49 +144,49 @@ void sitecing_fastcgi_pm::process(int slot) {
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);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.get_meta("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 while(true) { 170 while(true) {
171 full_component_path = config.root_source+'/'+component_path; 171 full_component_path = config.root_source+'/'+component_path;
172 if(!access(full_component_path.c_str(),F_OK)) 172 if(!access(full_component_path.c_str(),F_OK))
173 break; 173 break;
174 string::size_type sl = component_path.rfind('/'); 174 string::size_type sl = component_path.rfind('/');
175 if(sl==string::npos) 175 if(sl==string::npos)
176 throw konforka::exception(CODEPOINT,"can't find the target component"); 176 throw konforka::exception(CODEPOINT,"can't find the target component");
177 component_path.erase(sl); 177 component_path.erase(sl);
178 } 178 }
179 action = component_path; 179 action = component_path;
180 action_handler = config.lookup_action_handler(component_path); 180 action_handler = config.lookup_action_handler(component_path);
181 if(action_handler) { 181 if(action_handler) {
182 action = action_handler->action; 182 action = action_handler->action;
183 } 183 }
184 string pwd = dir_name(full_component_path); 184 string pwd = dir_name(full_component_path);
185 if(chdir(pwd.c_str())) 185 if(chdir(pwd.c_str()))
186 throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); 186 throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory");
187 so_component soc = ss.fetch(action,&scif); 187 so_component soc = ss.fetch(action,&scif);
188 if(action_handler) { 188 if(action_handler) {
189 soc.ac->run(__magic_action, 189 soc.ac->run(__magic_action,
190 config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), 190 config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(),
191 &(action_handler->args) 191 &(action_handler->args)
192 ); 192 );