made use of recenly introduced cgi_interface::path_info() function

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
@@ -120,97 +120,97 @@ sitecing_fastcgi_pm::sitecing_fastcgi_pm(const string& config_file)
 		throw konforka::exception(CODEPOINT,"failed to fork()");
 	    if(pf) {
 		die_humbly=true;
 		_exit(0);
 	    }
 	}
 	if(config.flags&configuration::flag_pid_file) {
 	    pidfile.set(config.pid_file);
 	}
 	if(multi)
 	    sem.init();
     }
 sitecing_fastcgi_pm::~sitecing_fastcgi_pm() {
     if(fss)
 	delete fss;
 }
 
 void sitecing_fastcgi_pm::process(int slot) {
     signal(SIGINT,SIG_DFL);
     signal(SIGABRT,SIG_DFL);
     signal(SIGTERM,SIG_DFL);
     give_up_privs();
     scoreboard_slot *sslot = sboard.get_slot(slot);
     try {
 	sitespace ss(config);
 	fcgi_socket& fs = *fss;
 	sitecing_interface_cgi scif(&ss);
 	string component_path;
 	string action;
 	config_options::action_handler_t *action_handler;
 	int rpc = 0;
 	if(config.flags&configuration::flag_requests_per_child)
 	    rpc = config.requests_per_child;
 	for(int req=0;(rpc<=0) || (req<rpc);rpc++) {
 	    semaphore_lock sl;
 	    if(multi) {
 		sslot->state = scoreboard_slot::state_idle;
 		sl.sem = &sem;
 		sl.lock();
 	    }
 	    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.get_meta("PATH_INFO"),strip_leading_slash|strip_trailing_slash);
+		component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash);
 		string full_component_path;
 		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)
 			throw konforka::exception(CODEPOINT,"can't find the target component");
 		    component_path.erase(sl);
 		}
 		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);
 		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)
 			    );
 		}else{
 		    soc.ac->main(0,NULL);
 		}
 	    }catch(http_status& hs) {
 		scif.headers["Status"] = hs.status+" "+hs.message;
 		string hshp = config.lookup_http_status_handler(component_path,hs.status);
 		if(!hshp.empty()) {
 		    so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status
 		    hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(),
 			    config.root_so.c_str(),action.c_str(),&hs);
 		}
 	    }catch(compile_error& ce) {
 		config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
 		if(co_exception_handler) {
 		    so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
 		    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());
 		}else{
 		    ce.see(CODEPOINT);
 		    throw;
 		}
 	    }catch(preprocessor_error& pe) {
 		config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
 		if(co_exception_handler) {
 		    so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
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
@@ -5,97 +5,97 @@
 #include <pwd.h>
 #include <grp.h>
 #include <errno.h>
 #include <syslog.h>
 #include <iostream>
 #include <memory>
 #include <typeinfo>
 using namespace std;
 #include "kingate/plaincgi.h"
 #include "kingate/cgi_gateway.h"
 using namespace kingate;
 #include "sitecing/sitecing_util.h"
 #include "sitecing/util.h"
 #include "sitecing/sitespace.h"
 #include "sitecing/sitecing_interface_cgi.h"
 #include "sitecing/cgi_component.h"
 #include "sitecing/configuration.h"
 #include "sitecing/magic.h"
 #include "sitecing/sitecing_exception.h"
 #include "sitecing/exception.h"
 using namespace sitecing;
 
 #include "config.h"
 #define PHEADER PACKAGE " Version " VERSION
 #define PCOPY   "Copyright (c) 2005 Klever Group"
 
 class cdummyClass : public acomponent {
     public:
 	void main(int _magic,va_list _args) {}
 	void *__the_most_derived_this() { return NULL; }
 } cdummyInstance;
 class adummyClass : public cgi_component {
     public:
 	void main(int _magic,va_list _args) {}
 	void *__the_most_derived_this() { return NULL; }
 } adummyInstance;
 
 void process_request(configuration& config) {
     try {
 	sitespace ss(config);
 	sitecing_interface_cgi scif(&ss);
 	string component_path;
 	string action;
 	config_options::action_handler_t *action_handler;
 	plaincgi_interface ci;
 	cgi_gateway gw(ci);
 	scif.prepare(&gw);
 	try {
-	    component_path = normalize_path(gw.get_meta("PATH_INFO"),strip_leading_slash|strip_trailing_slash);
+	    component_path = normalize_path(gw.path_info(),strip_leading_slash|strip_trailing_slash);
 	    string full_component_path;
 	    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)
 		    throw konforka::exception(CODEPOINT,"can't find the target component");
 		component_path.erase(sl);
 	    }
 	    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);
 	    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)
 			);
 	    }else{
 		soc.ac->main(0,NULL);
 	    }
 	}catch(http_status& hs) {
 	    scif.headers["Status"] = hs.status+" "+hs.message;
 	    string hshp = config.lookup_http_status_handler(component_path,hs.status);
 	    if(!hshp.empty()) {
 		so_component hsh = ss.fetch(hshp,&scif); // TODO: handle error trying to handle status
 		hsh.ac->run(__magic_http_status,config.root_source.c_str(),config.root_intermediate.c_str(),
 			config.root_so.c_str(),action.c_str(),&hs);
 	    }
 	}catch(compile_error& ce) {
 	    config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
 	    if(co_exception_handler) {
 		so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.
 		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());
 	    }else{
 		ce.see(CODEPOINT);
 		throw;
 	    }
 	}catch(preprocessor_error& pe) {
 	    config_options *co_exception_handler = config.lookup_config(component_path,config_options::flag_exception_handler);
 	    if(co_exception_handler) {
 		so_component eh = ss.fetch(co_exception_handler->exception_handler,&scif); // TODO: handle error trying to handle error.