-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | include/sitecing/sitecing_interface.h | 6 | ||||
-rw-r--r-- | lib/Makefile.am | 2 | ||||
-rw-r--r-- | src/sitecing-fastcgi.cc | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index fde326b..bb1557a 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,33 +1,33 @@ | |||
1 | AC_INIT([sitecing], [0.0.1], [sitecing-bugs@klever.net]) | 1 | AC_INIT([sitecing], [0.0.2], [sitecing-bugs@klever.net]) |
2 | AC_CONFIG_SRCDIR([include/sitecing/sitecing_parser.h]) | 2 | AC_CONFIG_SRCDIR([include/sitecing/sitecing_parser.h]) |
3 | AC_CONFIG_HEADER([config.h]) | 3 | AC_CONFIG_HEADER([config.h]) |
4 | AM_INIT_AUTOMAKE([dist-bzip2]) | 4 | AM_INIT_AUTOMAKE([dist-bzip2]) |
5 | 5 | ||
6 | AC_PROG_INSTALL | 6 | AC_PROG_INSTALL |
7 | AC_PROG_AWK | 7 | AC_PROG_AWK |
8 | AC_PROG_CXX | 8 | AC_PROG_CXX |
9 | AC_PROG_CC | 9 | AC_PROG_CC |
10 | AM_PROG_LEX | 10 | AM_PROG_LEX |
11 | AC_PROG_LIBTOOL | 11 | AC_PROG_LIBTOOL |
12 | 12 | ||
13 | AC_HEADER_STDC | 13 | AC_HEADER_STDC |
14 | AC_CHECK_HEADERS([stdlib.h unistd.h]) | 14 | AC_CHECK_HEADERS([stdlib.h unistd.h]) |
15 | 15 | ||
16 | AC_C_CONST | 16 | AC_C_CONST |
17 | 17 | ||
18 | AC_FUNC_MALLOC | 18 | AC_FUNC_MALLOC |
19 | AC_FUNC_REALLOC | 19 | AC_FUNC_REALLOC |
20 | 20 | ||
21 | AC_WITH_PKGCONFIG | 21 | AC_WITH_PKGCONFIG |
22 | 22 | ||
23 | PKG_CHECK_MODULES([KONFORKA],[konforka >= 0.0.1],,[ | 23 | PKG_CHECK_MODULES([KONFORKA],[konforka >= 0.0.1],,[ |
24 | AC_MSG_ERROR([no proper version of konforka library found, get it at http://kin.klever.net/konforka/]) | 24 | AC_MSG_ERROR([no proper version of konforka library found, get it at http://kin.klever.net/konforka/]) |
25 | ]) | 25 | ]) |
26 | 26 | ||
27 | PKG_CHECK_MODULES([KINGATE],[kingate >= 0.0.1],,[ | 27 | PKG_CHECK_MODULES([KINGATE],[kingate >= 0.0.1],,[ |
28 | AC_MSG_ERROR([no kingate library found, get it at http://kin.klever.net/kingate/]) | 28 | AC_MSG_ERROR([no kingate library found, get it at http://kin.klever.net/kingate/]) |
29 | ]) | 29 | ]) |
30 | HAVE_FCGI=false | 30 | HAVE_FCGI=false |
31 | HAVE_PLAINCGI=false | 31 | HAVE_PLAINCGI=false |
32 | PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi >= 0.0.1],[ | 32 | PKG_CHECK_MODULES([KINGATE_FCGI],[kingate-fcgi >= 0.0.1],[ |
33 | HAVE_FCGI=true | 33 | HAVE_FCGI=true |
diff --git a/include/sitecing/sitecing_interface.h b/include/sitecing/sitecing_interface.h index 0cba2bb..f0210d6 100644 --- a/include/sitecing/sitecing_interface.h +++ b/include/sitecing/sitecing_interface.h | |||
@@ -1,40 +1,44 @@ | |||
1 | #ifndef __SITECING_SITECING_INTERFACE_H | 1 | #ifndef __SITECING_SITECING_INTERFACE_H |
2 | #define __SITECING_SITECING_INTERFACE_H | 2 | #define __SITECING_SITECING_INTERFACE_H |
3 | 3 | ||
4 | #include <ostream> | 4 | #include <ostream> |
5 | 5 | ||
6 | /** | 6 | /** |
7 | * @file | 7 | * @file |
8 | * @brief The sitecing_interface call declaration. | 8 | * @brief The sitecing_interface call declaration. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | namespace sitecing { | 11 | namespace sitecing { |
12 | using namespace std; | 12 | using namespace std; |
13 | 13 | ||
14 | /** | 14 | /** |
15 | * @brief the interface to site-C-ing. | 15 | * @brief the interface to site-C-ing. |
16 | * | 16 | * |
17 | * The basic class used to convey communications between the component and | 17 | * The basic class used to convey communications between the component and |
18 | * the sitecing core. | 18 | * the sitecing core. |
19 | */ | 19 | */ |
20 | class sitecing_interface { | 20 | class sitecing_interface { |
21 | public: | 21 | public: |
22 | /** | 22 | /** |
23 | * Pointer to the output stream. | 23 | * Pointer to the output stream. |
24 | */ | 24 | */ |
25 | ostream *out; | 25 | ostream *out; |
26 | /** | ||
27 | * Serial number of request being processed. | ||
28 | */ | ||
29 | long serial; | ||
26 | 30 | ||
27 | /** | 31 | /** |
28 | * The default constructor doesn't do much. | 32 | * The default constructor doesn't do much. |
29 | */ | 33 | */ |
30 | sitecing_interface() : out(0) {} | 34 | sitecing_interface() : out(0), serial(0) {} |
31 | /** | 35 | /** |
32 | * The constructor initializes the output stream pointer. | 36 | * The constructor initializes the output stream pointer. |
33 | * @param o the value to initialize the output stream pointer with. | 37 | * @param o the value to initialize the output stream pointer with. |
34 | */ | 38 | */ |
35 | sitecing_interface(ostream* o) : out(o) {} | 39 | sitecing_interface(ostream* o) : out(o) {} |
36 | }; | 40 | }; |
37 | 41 | ||
38 | } | 42 | } |
39 | 43 | ||
40 | #endif /* __SITECING_SITECING_INTERFACE_H */ | 44 | #endif /* __SITECING_SITECING_INTERFACE_H */ |
diff --git a/lib/Makefile.am b/lib/Makefile.am index 53d8182..496177b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am | |||
@@ -1,22 +1,22 @@ | |||
1 | lib_LTLIBRARIES = libsitecing.la | 1 | lib_LTLIBRARIES = libsitecing.la |
2 | noinst_HEADERS = pch.h | 2 | noinst_HEADERS = pch.h |
3 | 3 | ||
4 | INCLUDES = -I${top_srcdir}/include -I${top_builddir} ${KINGATE_CFLAGS} ${DOTCONF_CFLAGS} \ | 4 | INCLUDES = -I${top_srcdir}/include -I${top_builddir} ${KINGATE_CFLAGS} ${DOTCONF_CFLAGS} \ |
5 | ${PCREPP_CFLAGS} | 5 | ${PCREPP_CFLAGS} |
6 | AM_CPPFLAGS = -D__SC_DEFAULT_SKELETON=\"${pkgdatadir}/component.skel\" | 6 | AM_CPPFLAGS = -D__SC_DEFAULT_SKELETON=\"${pkgdatadir}/component.skel\" |
7 | AM_LFLAGS = -olex.yy.c | 7 | AM_LFLAGS = -olex.yy.c |
8 | 8 | ||
9 | libsitecing_la_SOURCES = \ | 9 | libsitecing_la_SOURCES = \ |
10 | sitecing_parser.ll sitecing_enflesher.ll \ | 10 | sitecing_parser.ll sitecing_enflesher.ll \ |
11 | sitecing_interface_cgi.cc \ | 11 | sitecing_interface_cgi.cc \ |
12 | acomponent.cc \ | 12 | acomponent.cc \ |
13 | cgi_component.cc \ | 13 | cgi_component.cc \ |
14 | component_so.cc \ | 14 | component_so.cc \ |
15 | file_factory.cc component_factory.cc \ | 15 | file_factory.cc component_factory.cc \ |
16 | sitespace.cc \ | 16 | sitespace.cc \ |
17 | configuration.cc \ | 17 | configuration.cc \ |
18 | util.cc sitecing_util.cc \ | 18 | util.cc sitecing_util.cc \ |
19 | scoreboard.cc \ | 19 | scoreboard.cc \ |
20 | process_manager.cc | 20 | process_manager.cc |
21 | libsitecing_la_LDFLAGS = \ | 21 | libsitecing_la_LDFLAGS = \ |
22 | -version-info 1:0:0 | 22 | -version-info 2:0:0 |
diff --git a/src/sitecing-fastcgi.cc b/src/sitecing-fastcgi.cc index 57aba60..4768e8f 100644 --- a/src/sitecing-fastcgi.cc +++ b/src/sitecing-fastcgi.cc | |||
@@ -134,64 +134,65 @@ sitecing_fastcgi_pm::~sitecing_fastcgi_pm() { | |||
134 | delete fss; | 134 | delete fss; |
135 | } | 135 | } |
136 | 136 | ||
137 | void sitecing_fastcgi_pm::process(int slot) { | 137 | void sitecing_fastcgi_pm::process(int slot) { |
138 | signal(SIGINT,SIG_DFL); | 138 | signal(SIGINT,SIG_DFL); |
139 | signal(SIGABRT,SIG_DFL); | 139 | signal(SIGABRT,SIG_DFL); |
140 | signal(SIGTERM,SIG_DFL); | 140 | signal(SIGTERM,SIG_DFL); |
141 | give_up_privs(); | 141 | give_up_privs(); |
142 | scoreboard_slot *sslot = sboard.get_slot(slot); | 142 | scoreboard_slot *sslot = sboard.get_slot(slot); |
143 | try { | 143 | try { |
144 | sitespace ss(config); | 144 | sitespace ss(config); |
145 | fcgi_socket& fs = *fss; | 145 | fcgi_socket& fs = *fss; |
146 | sitecing_interface_cgi scif(&ss); | 146 | sitecing_interface_cgi scif(&ss); |
147 | string component_path; | 147 | string component_path; |
148 | string action; | 148 | string action; |
149 | config_options::action_handler_t *action_handler; | 149 | config_options::action_handler_t *action_handler; |
150 | int rpc = 0; | 150 | int rpc = 0; |
151 | if(config.flags&configuration::flag_requests_per_child) | 151 | if(config.flags&configuration::flag_requests_per_child) |
152 | rpc = config.requests_per_child; | 152 | rpc = config.requests_per_child; |
153 | for(int req=0;(rpc<=0) || (req<rpc);++req) { | 153 | for(int req=0;(rpc<=0) || (req<rpc);++req) { |
154 | semaphore_lock sl; | 154 | semaphore_lock sl; |
155 | if(multi) { | 155 | if(multi) { |
156 | sslot->state = scoreboard_slot::state_idle; | 156 | sslot->state = scoreboard_slot::state_idle; |
157 | sl.sem = &sem; | 157 | sl.sem = &sem; |
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.serial; | ||
166 | scif.prepare(&gw); | 167 | scif.prepare(&gw); |
167 | try { | 168 | try { |
168 | component_path = konforka::normalize_path(gw.path_info(),konforka::strip_leading_slash|konforka::strip_trailing_slash); | 169 | component_path = konforka::normalize_path(gw.path_info(),konforka::strip_leading_slash|konforka::strip_trailing_slash); |
169 | string full_component_path; | 170 | string full_component_path; |
170 | string sitecing_path_info; | 171 | string sitecing_path_info; |
171 | while(true) { | 172 | while(true) { |
172 | full_component_path = config.root_source+'/'+component_path; | 173 | full_component_path = config.root_source+'/'+component_path; |
173 | if(!access(full_component_path.c_str(),F_OK)) | 174 | if(!access(full_component_path.c_str(),F_OK)) |
174 | break; | 175 | break; |
175 | string::size_type sl = component_path.rfind('/'); | 176 | string::size_type sl = component_path.rfind('/'); |
176 | if(sl==string::npos) | 177 | if(sl==string::npos) |
177 | throw konforka::exception(CODEPOINT,"can't find the target component"); | 178 | throw konforka::exception(CODEPOINT,"can't find the target component"); |
178 | sitecing_path_info.insert(0,component_path,sl,string::npos); | 179 | sitecing_path_info.insert(0,component_path,sl,string::npos); |
179 | component_path.erase(sl); | 180 | component_path.erase(sl); |
180 | } | 181 | } |
181 | fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info; | 182 | fi.metavars["SITECING_PATH_INFO"]=sitecing_path_info; |
182 | fi.metavars["SITECING_COMPONENT_PATH"]=component_path; | 183 | fi.metavars["SITECING_COMPONENT_PATH"]=component_path; |
183 | action = component_path; | 184 | action = component_path; |
184 | action_handler = config.lookup_action_handler(component_path); | 185 | action_handler = config.lookup_action_handler(component_path); |
185 | if(action_handler) { | 186 | if(action_handler) { |
186 | action = action_handler->action; | 187 | action = action_handler->action; |
187 | } | 188 | } |
188 | string pwd = konforka::dir_name(full_component_path); | 189 | string pwd = konforka::dir_name(full_component_path); |
189 | if(chdir(pwd.c_str())) | 190 | if(chdir(pwd.c_str())) |
190 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); | 191 | throw konforka::exception(CODEPOINT,"failed to chdir() into document's directory"); |
191 | so_component soc = ss.fetch(action,&scif); | 192 | so_component soc = ss.fetch(action,&scif); |
192 | if(action_handler) { | 193 | if(action_handler) { |
193 | soc.ac->run(__magic_action, | 194 | soc.ac->run(__magic_action, |
194 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), | 195 | config.root_source.c_str(), config.root_intermediate.c_str(), config.root_so.c_str(), |
195 | &(action_handler->args) | 196 | &(action_handler->args) |
196 | ); | 197 | ); |
197 | }else{ | 198 | }else{ |