-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,7 +1,7 @@ | |||
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 |
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 | |||
@@ -20,17 +20,21 @@ namespace sitecing { | |||
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 | }; |
diff --git a/lib/Makefile.am b/lib/Makefile.am index 53d8182..496177b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am | |||
@@ -16,7 +16,7 @@ libsitecing_la_SOURCES = \ | |||
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 | |||
@@ -160,12 +160,13 @@ void sitecing_fastcgi_pm::process(int slot) { | |||
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) { |