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 | |
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 | |||
22 | 22 | ||
23 | PKG_CHECK_MODULES([KINGATE],[kingate],,[ | 23 | PKG_CHECK_MODULES([KINGATE],[kingate >= 0.0.1],,[ |
24 | AC_MSG_ERROR([no kingate library found, get it at http://kin.klever.net/kingate/]) | 24 | AC_MSG_ERROR([no kingate library found, get it at http://kin.klever.net/kingate/]) |
@@ -27,3 +27,3 @@ HAVE_FCGI=false | |||
27 | HAVE_PLAINCGI=false | 27 | HAVE_PLAINCGI=false |
28 | PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi],[ | 28 | PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi >= 0.0.1],[ |
29 | HAVE_FCGI=true | 29 | HAVE_FCGI=true |
@@ -32,3 +32,3 @@ PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi],[ | |||
32 | ]) | 32 | ]) |
33 | PKG_CHECK_MODULES([KINGATE_PLAINCGI],[kingate-plaincgi],[ | 33 | PKG_CHECK_MODULES([KINGATE_PLAINCGI],[kingate-plaincgi >= 0.0.1],[ |
34 | HAVE_PLAINCGI=true | 34 | 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 { | |||
94 | if( (!co_cpp_deps) || co_cpp_deps->cpp_deps) { | 94 | if( (!co_cpp_deps) || co_cpp_deps->cpp_deps) { |
95 | ifstream df((root_intermediate+noro+".d").c_str(),ios::in); | 95 | ifstream df((root_intermediate+nos+".d").c_str(),ios::in); |
96 | if(df.good()) { | 96 | 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 { | |||
20 | return false; | 20 | return false; |
21 | for(file_list_t::const_iterator i=fl->begin();i!=fl->end();i++) { | 21 | for(file_list_t::const_iterator i=fl->begin();i!=fl->end();++i) { |
22 | struct stat stdep; | 22 | 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) { | |||
169 | string full_component_path; | 169 | string full_component_path; |
170 | string sitecing_path_info; | ||
170 | while(true) { | 171 | while(true) { |
@@ -176,4 +177,6 @@ void sitecing_fastcgi_pm::process(int slot) { | |||
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; |
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) { | |||
54 | string full_component_path; | 54 | string full_component_path; |
55 | string sitecing_path_info; | ||
55 | while(true) { | 56 | while(true) { |
@@ -61,4 +62,6 @@ void process_request(configuration& config) { | |||
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; |