| -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,13 +1,13 @@ -AC_INIT([sitecing], [0.0.1], [sitecing-bugs@klever.net]) +AC_INIT([sitecing], [0.0.2], [sitecing-bugs@klever.net]) AC_CONFIG_SRCDIR([include/sitecing/sitecing_parser.h]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([dist-bzip2]) AC_PROG_INSTALL AC_PROG_AWK AC_PROG_CXX AC_PROG_CC AM_PROG_LEX AC_PROG_LIBTOOL AC_HEADER_STDC 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 @@ -14,27 +14,31 @@ namespace sitecing { /** * @brief the interface to site-C-ing. * * The basic class used to convey communications between the component and * the sitecing core. */ class sitecing_interface { public: /** * Pointer to the output stream. */ ostream *out; + /** + * Serial number of request being processed. + */ + long serial; /** * The default constructor doesn't do much. */ - sitecing_interface() : out(0) {} + sitecing_interface() : out(0), serial(0) {} /** * The constructor initializes the output stream pointer. * @param o the value to initialize the output stream pointer with. */ sitecing_interface(ostream* o) : out(o) {} }; } #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 @@ -10,13 +10,13 @@ libsitecing_la_SOURCES = \ sitecing_parser.ll sitecing_enflesher.ll \ sitecing_interface_cgi.cc \ acomponent.cc \ cgi_component.cc \ component_so.cc \ file_factory.cc component_factory.cc \ sitespace.cc \ configuration.cc \ util.cc sitecing_util.cc \ scoreboard.cc \ process_manager.cc libsitecing_la_LDFLAGS = \ - -version-info 1:0:0 + -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 @@ -154,24 +154,25 @@ void sitecing_fastcgi_pm::process(int slot) { 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.serial; scif.prepare(&gw); try { 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) throw konforka::exception(CODEPOINT,"can't find the target component"); |