author | Michael Krelin <hacker@klever.net> | 2005-03-31 22:09:50 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2005-03-31 22:09:50 (UTC) |
commit | 986589d804cf07f58b0b9b8786267bf9032d231c (patch) (unidiff) | |
tree | 0cbf7e440ecd27d9a28fb73ec718241ef1082d7d | |
parent | 185d182cd6d3e0593a3627837f3bb400b654e602 (diff) | |
download | sitecing-986589d804cf07f58b0b9b8786267bf9032d231c.zip sitecing-986589d804cf07f58b0b9b8786267bf9032d231c.tar.gz sitecing-986589d804cf07f58b0b9b8786267bf9032d231c.tar.bz2 |
made use of recenly introduced cgi_interface::path_info() function
-rw-r--r-- | src/sitecing-fastcgi.cc | 2 | ||||
-rw-r--r-- | src/sitecing-plaincgi.cc | 2 |
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 | |||
@@ -156,25 +156,25 @@ void sitecing_fastcgi_pm::process(int slot) { | |||
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); |
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 | |||
@@ -41,25 +41,25 @@ class adummyClass : public cgi_component { | |||
41 | 41 | ||
42 | void process_request(configuration& config) { | 42 | void process_request(configuration& config) { |
43 | try { | 43 | try { |
44 | sitespace ss(config); | 44 | sitespace ss(config); |
45 | sitecing_interface_cgi scif(&ss); | 45 | sitecing_interface_cgi scif(&ss); |
46 | string component_path; | 46 | string component_path; |
47 | string action; | 47 | string action; |
48 | config_options::action_handler_t *action_handler; | 48 | config_options::action_handler_t *action_handler; |
49 | plaincgi_interface ci; | 49 | plaincgi_interface ci; |
50 | cgi_gateway gw(ci); | 50 | cgi_gateway gw(ci); |
51 | scif.prepare(&gw); | 51 | scif.prepare(&gw); |
52 | try { | 52 | try { |
53 | component_path = normalize_path(gw.get_meta("PATH_INFO"),strip_leading_slash|strip_trailing_slash); | 53 | component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash); |
54 | string full_component_path; | 54 | string full_component_path; |
55 | while(true) { | 55 | while(true) { |
56 | full_component_path = config.root_source+'/'+component_path; | 56 | full_component_path = config.root_source+'/'+component_path; |
57 | if(!access(full_component_path.c_str(),F_OK)) | 57 | if(!access(full_component_path.c_str(),F_OK)) |
58 | break; | 58 | break; |
59 | string::size_type sl = component_path.rfind('/'); | 59 | string::size_type sl = component_path.rfind('/'); |
60 | if(sl==string::npos) | 60 | if(sl==string::npos) |
61 | throw konforka::exception(CODEPOINT,"can't find the target component"); | 61 | throw konforka::exception(CODEPOINT,"can't find the target component"); |
62 | component_path.erase(sl); | 62 | component_path.erase(sl); |
63 | } | 63 | } |
64 | action = component_path; | 64 | action = component_path; |
65 | action_handler = config.lookup_action_handler(component_path); | 65 | action_handler = config.lookup_action_handler(component_path); |