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 | |||
@@ -158,33 +158,36 @@ void sitecing_fastcgi_pm::process(int slot) { | |||
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(), |
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 | |||
@@ -43,33 +43,36 @@ 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(), |