author | Michael Krelin <hacker@klever.net> | 2005-04-24 19:37:17 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2005-04-24 19:37:17 (UTC) |
commit | 54e344b7e3623e807b893b7febad3adfc6c1648f (patch) (unidiff) | |
tree | ded792083882fbe452992b6808487baec269526a /src | |
parent | 83cf01018c67e7eb5e1cca7d698bac731f8e1e9d (diff) | |
download | sitecing-54e344b7e3623e807b893b7febad3adfc6c1648f.zip sitecing-54e344b7e3623e807b893b7febad3adfc6c1648f.tar.gz sitecing-54e344b7e3623e807b893b7febad3adfc6c1648f.tar.bz2 |
1. setting up of SITECING_PATH_INFO environment variable
2. bumped up kingate version requirement
3. fixed a bug in component build process
-rw-r--r-- | src/sitecing-fastcgi.cc | 3 | ||||
-rw-r--r-- | src/sitecing-plaincgi.cc | 3 |
2 files changed, 6 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 | |||
@@ -122,105 +122,108 @@ sitecing_fastcgi_pm::sitecing_fastcgi_pm(const string& config_file) | |||
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 | } |
132 | sitecing_fastcgi_pm::~sitecing_fastcgi_pm() { | 132 | sitecing_fastcgi_pm::~sitecing_fastcgi_pm() { |
133 | if(fss) | 133 | if(fss) |
134 | delete fss; | 134 | delete fss; |
135 | } | 135 | } |
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.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); |
203 | } | 206 | } |
204 | }catch(compile_error& ce) { | 207 | }catch(compile_error& ce) { |
205 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); | 208 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); |
206 | if(co_exception_handler) { | 209 | if(co_exception_handler) { |
207 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. | 210 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. |
208 | eh.ac->run(__magic_compile_error,ce.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),ce.component_path.c_str()); | 211 | eh.ac->run(__magic_compile_error,ce.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),ce.component_path.c_str()); |
209 | }else{ | 212 | }else{ |
210 | ce.see(CODEPOINT); | 213 | ce.see(CODEPOINT); |
211 | throw; | 214 | throw; |
212 | } | 215 | } |
213 | }catch(preprocessor_error& pe) { | 216 | }catch(preprocessor_error& pe) { |
214 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); | 217 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); |
215 | if(co_exception_handler) { | 218 | if(co_exception_handler) { |
216 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. | 219 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. |
217 | eh.ac->run(__magic_preprocess_error,pe.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),pe.component_name.c_str(),pe.line_number); | 220 | eh.ac->run(__magic_preprocess_error,pe.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),pe.component_name.c_str(),pe.line_number); |
218 | }else{ | 221 | }else{ |
219 | pe.see(CODEPOINT); | 222 | pe.see(CODEPOINT); |
220 | throw; | 223 | throw; |
221 | } | 224 | } |
222 | }catch(exception& e) { | 225 | }catch(exception& e) { |
223 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); | 226 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); |
224 | if(co_exception_handler) { | 227 | if(co_exception_handler) { |
225 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. | 228 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. |
226 | eh.ac->run(__magic_generic_exception,e.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),component_path.c_str(),&e); | 229 | eh.ac->run(__magic_generic_exception,e.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),component_path.c_str(),&e); |
diff --git a/src/sitecing-plaincgi.cc b/src/sitecing-plaincgi.cc index 6e8a215..3bd291a 100644 --- a/src/sitecing-plaincgi.cc +++ b/src/sitecing-plaincgi.cc | |||
@@ -7,105 +7,108 @@ | |||
7 | #include <errno.h> | 7 | #include <errno.h> |
8 | #include <syslog.h> | 8 | #include <syslog.h> |
9 | #include <iostream> | 9 | #include <iostream> |
10 | #include <memory> | 10 | #include <memory> |
11 | #include <typeinfo> | 11 | #include <typeinfo> |
12 | using namespace std; | 12 | using namespace std; |
13 | #include "kingate/plaincgi.h" | 13 | #include "kingate/plaincgi.h" |
14 | #include "kingate/cgi_gateway.h" | 14 | #include "kingate/cgi_gateway.h" |
15 | using namespace kingate; | 15 | using namespace kingate; |
16 | #include "sitecing/sitecing_util.h" | 16 | #include "sitecing/sitecing_util.h" |
17 | #include "sitecing/util.h" | 17 | #include "sitecing/util.h" |
18 | #include "sitecing/sitespace.h" | 18 | #include "sitecing/sitespace.h" |
19 | #include "sitecing/sitecing_interface_cgi.h" | 19 | #include "sitecing/sitecing_interface_cgi.h" |
20 | #include "sitecing/cgi_component.h" | 20 | #include "sitecing/cgi_component.h" |
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.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 | string sitecing_path_info; | ||
55 | while(true) { | 56 | while(true) { |
56 | full_component_path = config.root_source+'/'+component_path; | 57 | full_component_path = config.root_source+'/'+component_path; |
57 | if(!access(full_component_path.c_str(),F_OK)) | 58 | if(!access(full_component_path.c_str(),F_OK)) |
58 | break; | 59 | break; |
59 | string::size_type sl = component_path.rfind('/'); | 60 | string::size_type sl = component_path.rfind('/'); |
60 | if(sl==string::npos) | 61 | if(sl==string::npos) |
61 | throw konforka::exception(CODEPOINT,"can't find the target component"); | 62 | throw konforka::exception(CODEPOINT,"can't find the target component"); |
63 | sitecing_path_info.insert(0,component_path,sl,string::npos); | ||
62 | component_path.erase(sl); | 64 | component_path.erase(sl); |
63 | } | 65 | } |
66 | ci.metavars["SITECING_PATH_INFO"]=sitecing_path_info; | ||
64 | action = component_path; | 67 | action = component_path; |
65 | action_handler = config.lookup_action_handler(component_path); | 68 | action_handler = config.lookup_action_handler(component_path); |
66 | if(action_handler) { | 69 | if(action_handler) { |
67 | action = action_handler->action; | 70 | action = action_handler->action; |
68 | } | 71 | } |
69 | string pwd = dir_name(full_component_path); | 72 | string pwd = dir_name(full_component_path); |
70 | if(chdir(pwd.c_str())) | 73 | if(chdir(pwd.c_str())) |
71 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); | 74 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); |
72 | so_component soc = ss.fetch(action,&scif); | 75 | so_component soc = ss.fetch(action,&scif); |
73 | if(action_handler) { | 76 | if(action_handler) { |
74 | soc.ac->run(__magic_action, | 77 | soc.ac->run(__magic_action, |
75 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), | 78 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), |
76 | &(action_handler->args) | 79 | &(action_handler->args) |
77 | ); | 80 | ); |
78 | }else{ | 81 | }else{ |
79 | soc.ac->main(0,NULL); | 82 | soc.ac->main(0,NULL); |
80 | } | 83 | } |
81 | }catch(http_status& hs) { | 84 | }catch(http_status& hs) { |
82 | scif.headers["Status"] = hs.status+" "+hs.message; | 85 | scif.headers["Status"] = hs.status+" "+hs.message; |
83 | string hshp = config.lookup_http_status_handler(component_path,hs.status); | 86 | string hshp = config.lookup_http_status_handler(component_path,hs.status); |
84 | if(!hshp.empty()) { | 87 | if(!hshp.empty()) { |
85 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status | 88 | so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status |
86 | hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(), | 89 | hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(), |
87 | config.root_so.c_str(),action.c_str(),&hs); | 90 | config.root_so.c_str(),action.c_str(),&hs); |
88 | } | 91 | } |
89 | }catch(compile_error& ce) { | 92 | }catch(compile_error& ce) { |
90 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); | 93 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); |
91 | if(co_exception_handler) { | 94 | if(co_exception_handler) { |
92 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. | 95 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. |
93 | eh.ac->run(__magic_compile_error,ce.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),ce.component_path.c_str()); | 96 | eh.ac->run(__magic_compile_error,ce.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),ce.component_path.c_str()); |
94 | }else{ | 97 | }else{ |
95 | ce.see(CODEPOINT); | 98 | ce.see(CODEPOINT); |
96 | throw; | 99 | throw; |
97 | } | 100 | } |
98 | }catch(preprocessor_error& pe) { | 101 | }catch(preprocessor_error& pe) { |
99 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); | 102 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); |
100 | if(co_exception_handler) { | 103 | if(co_exception_handler) { |
101 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. | 104 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. |
102 | eh.ac->run(__magic_preprocess_error,pe.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),pe.component_name.c_str(),pe.line_number); | 105 | eh.ac->run(__magic_preprocess_error,pe.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),pe.component_name.c_str(),pe.line_number); |
103 | }else{ | 106 | }else{ |
104 | pe.see(CODEPOINT); | 107 | pe.see(CODEPOINT); |
105 | throw; | 108 | throw; |
106 | } | 109 | } |
107 | }catch(exception& e) { | 110 | }catch(exception& e) { |
108 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); | 111 | config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler); |
109 | if(co_exception_handler) { | 112 | if(co_exception_handler) { |
110 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. | 113 | so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error. |
111 | eh.ac->run(__magic_generic_exception,e.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),component_path.c_str(),&e); | 114 | eh.ac->run(__magic_generic_exception,e.what(),config.root_source.c_str(),config.root_intermediate.c_str(),config.root_so.c_str(),component_path.c_str(),&e); |