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 | |||
@@ -136,65 +136,65 @@ sitecing_fastcgi_pm::~sitecing_fastcgi_pm() { | |||
136 | 136 | ||
137 | void sitecing_fastcgi_pm::process(int slot) { | 137 | void 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);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 | ); |
193 | }else{ | 193 | }else{ |
194 | soc.ac->main(0,NULL); | 194 | soc.ac->main(0,NULL); |
195 | } | 195 | } |
196 | }catch(http_status& hs) { | 196 | }catch(http_status& hs) { |
197 | scif.headers["Status"] = hs.status+" "+hs.message; | 197 | scif.headers["Status"] = hs.status+" "+hs.message; |
198 | string hshp = config.lookup_http_status_handler(component_path,hs.status); | 198 | string hshp = config.lookup_http_status_handler(component_path,hs.status); |
199 | if(!hshp.empty()) { | 199 | if(!hshp.empty()) { |
200 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status | 200 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status |
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 | |||
@@ -21,65 +21,65 @@ using namespace kingate; | |||
21 | #include "sitecing/configuration.h" | 21 | #include "sitecing/configuration.h" |
22 | #include "sitecing/magic.h" | 22 | #include "sitecing/magic.h" |
23 | #include "sitecing/sitecing_exception.h" | 23 | #include "sitecing/sitecing_exception.h" |
24 | #include "sitecing/exception.h" | 24 | #include "sitecing/exception.h" |
25 | using namespace sitecing; | 25 | using namespace sitecing; |
26 | 26 | ||
27 | #include "config.h" | 27 | #include "config.h" |
28 | #define PHEADER PACKAGE " Version " VERSION | 28 | #define PHEADER PACKAGE " Version " VERSION |
29 | #define PCOPY "Copyright (c) 2005 Klever Group" | 29 | #define PCOPY "Copyright (c) 2005 Klever Group" |
30 | 30 | ||
31 | class cdummyClass : public acomponent { | 31 | class cdummyClass : public acomponent { |
32 | public: | 32 | public: |
33 | void main(int _magic,va_list _args) {} | 33 | void main(int _magic,va_list _args) {} |
34 | void *__the_most_derived_this() { return NULL; } | 34 | void *__the_most_derived_this() { return NULL; } |
35 | } cdummyInstance; | 35 | } cdummyInstance; |
36 | class adummyClass : public cgi_component { | 36 | class adummyClass : public cgi_component { |
37 | public: | 37 | public: |
38 | void main(int _magic,va_list _args) {} | 38 | void main(int _magic,va_list _args) {} |
39 | void *__the_most_derived_this() { return NULL; } | 39 | void *__the_most_derived_this() { return NULL; } |
40 | } adummyInstance; | 40 | } adummyInstance; |
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); |
66 | if(action_handler) { | 66 | if(action_handler) { |
67 | action = action_handler->action; | 67 | action = action_handler->action; |
68 | } | 68 | } |
69 | string pwd = dir_name(full_component_path); | 69 | string pwd = dir_name(full_component_path); |
70 | if(chdir(pwd.c_str())) | 70 | if(chdir(pwd.c_str())) |
71 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); | 71 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); |
72 | so_component soc = ss.fetch(action,&scif); | 72 | so_component soc = ss.fetch(action,&scif); |
73 | if(action_handler) { | 73 | if(action_handler) { |
74 | soc.ac->run(__magic_action, | 74 | soc.ac->run(__magic_action, |
75 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), | 75 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), |
76 | &(action_handler->args) | 76 | &(action_handler->args) |
77 | ); | 77 | ); |
78 | }else{ | 78 | }else{ |
79 | soc.ac->main(0,NULL); | 79 | soc.ac->main(0,NULL); |
80 | } | 80 | } |
81 | }catch(http_status& hs) { | 81 | }catch(http_status& hs) { |
82 | scif.headers["Status"] = hs.status+" "+hs.message; | 82 | scif.headers["Status"] = hs.status+" "+hs.message; |
83 | string hshp = config.lookup_http_status_handler(component_path,hs.status); | 83 | string hshp = config.lookup_http_status_handler(component_path,hs.status); |
84 | if(!hshp.empty()) { | 84 | if(!hshp.empty()) { |
85 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status | 85 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status |