author | Michael Krelin <hacker@klever.net> | 2005-04-25 16:36:32 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2005-04-25 16:36:32 (UTC) |
commit | 981b219f5297ad2ccc1fc1d0e24e41ec009c35a3 (patch) (side-by-side diff) | |
tree | 9fa81d7fe70883ad26d946c902ba06edcebd4516 /src/sitecing-fastcgi.cc | |
parent | 54e344b7e3623e807b893b7febad3adfc6c1648f (diff) | |
download | sitecing-981b219f5297ad2ccc1fc1d0e24e41ec009c35a3.zip sitecing-981b219f5297ad2ccc1fc1d0e24e41ec009c35a3.tar.gz sitecing-981b219f5297ad2ccc1fc1d0e24e41ec009c35a3.tar.bz2 |
moved a few utility functions to konforka and bumped konforka version requirement accordingly
-rw-r--r-- | src/sitecing-fastcgi.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sitecing-fastcgi.cc b/src/sitecing-fastcgi.cc index 756dcee..03587aa 100644 --- a/src/sitecing-fastcgi.cc +++ b/src/sitecing-fastcgi.cc @@ -160,17 +160,17 @@ void sitecing_fastcgi_pm::process(int slot) { sslot->state = scoreboard_slot::state_accept; fcgi_interface fi(fs); sslot->state = scoreboard_slot::state_processing; if(multi) sl.unlock(); cgi_gateway gw(fi); scif.prepare(&gw); try { - component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash); + component_path = konforka::normalize_path(gw.path_info(),konforka::strip_leading_slash|konforka::strip_trailing_slash); string full_component_path; string sitecing_path_info; while(true) { full_component_path = config.root_source+'/'+component_path; if(!access(full_component_path.c_str(),F_OK)) break; string::size_type sl = component_path.rfind('/'); if(sl==string::npos) @@ -179,17 +179,17 @@ void sitecing_fastcgi_pm::process(int slot) { component_path.erase(sl); } fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info; action = component_path; action_handler = config.lookup_action_handler(component_path); if(action_handler) { action = action_handler->action; } - string pwd = dir_name(full_component_path); + string pwd = konforka::dir_name(full_component_path); if(chdir(pwd.c_str())) throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); so_component soc = ss.fetch(action,&scif); if(action_handler) { soc.ac->run(__magic_action, config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), &(action_handler->args) ); |