| 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) (side-by-side diff) | |
| tree | ded792083882fbe452992b6808487baec269526a | |
| 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-- | configure.ac | 6 | ||||
| -rw-r--r-- | lib/component_factory.cc | 2 | ||||
| -rw-r--r-- | lib/file_factory.cc | 2 | ||||
| -rw-r--r-- | src/sitecing-fastcgi.cc | 3 | ||||
| -rw-r--r-- | src/sitecing-plaincgi.cc | 3 |
5 files changed, 11 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index b9e9b56..a8aa142 100644 --- a/configure.ac +++ b/configure.ac @@ -22,3 +22,3 @@ AC_WITH_PKGCONFIG -PKG_CHECK_MODULES([KINGATE],[kingate],,[ +PKG_CHECK_MODULES([KINGATE],[kingate >= 0.0.1],,[ AC_MSG_ERROR([no kingate library found, get it at http://kin.klever.net/kingate/]) @@ -27,3 +27,3 @@ HAVE_FCGI=false HAVE_PLAINCGI=false -PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi],[ +PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi >= 0.0.1],[ HAVE_FCGI=true @@ -32,3 +32,3 @@ PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi],[ ]) -PKG_CHECK_MODULES([KINGATE_PLAINCGI],[kingate-plaincgi],[ +PKG_CHECK_MODULES([KINGATE_PLAINCGI],[kingate-plaincgi >= 0.0.1],[ HAVE_PLAINCGI=true diff --git a/lib/component_factory.cc b/lib/component_factory.cc index b5e95af..d9692de 100644 --- a/lib/component_factory.cc +++ b/lib/component_factory.cc @@ -94,3 +94,3 @@ namespace sitecing { if( (!co_cpp_deps) || co_cpp_deps->cpp_deps) { - ifstream df((root_intermediate+noro+".d").c_str(),ios::in); + ifstream df((root_intermediate+nos+".d").c_str(),ios::in); if(df.good()) { diff --git a/lib/file_factory.cc b/lib/file_factory.cc index 7ca7b86..c22fac2 100644 --- a/lib/file_factory.cc +++ b/lib/file_factory.cc @@ -20,3 +20,3 @@ namespace sitecing { return false; - for(file_list_t::const_iterator i=fl->begin();i!=fl->end();i++) { + for(file_list_t::const_iterator i=fl->begin();i!=fl->end();++i) { struct stat stdep; 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 @@ -169,2 +169,3 @@ void sitecing_fastcgi_pm::process(int slot) { string full_component_path; + string sitecing_path_info; while(true) { @@ -176,4 +177,6 @@ void sitecing_fastcgi_pm::process(int slot) { throw konforka::exception(CODEPOINT,"can't find the target component"); + sitecing_path_info.insert(0,component_path,sl,string::npos); component_path.erase(sl); } + fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info; action = component_path; 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 @@ -54,2 +54,3 @@ void process_request(configuration& config) { string full_component_path; + string sitecing_path_info; while(true) { @@ -61,4 +62,6 @@ void process_request(configuration& config) { throw konforka::exception(CODEPOINT,"can't find the target component"); + sitecing_path_info.insert(0,component_path,sl,string::npos); component_path.erase(sl); } + ci.metavars["SITECING_PATH_INFO"]=sitecing_path_info; action = component_path; |