| author | Michael Krelin <hacker@klever.net> | 2005-06-11 14:49:35 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2005-06-11 14:49:35 (UTC) |
| commit | 621221c40a42683a185b15b99c03fd6c8b6f7d90 (patch) (side-by-side diff) | |
| tree | 061f1e7a9fb7b16122eed9715c1a180629dbd953 | |
| parent | 01e3789f5b7c3b2c0282b70eb203d11c76d3c8f3 (diff) | |
| download | sitecing-621221c40a42683a185b15b99c03fd6c8b6f7d90.zip sitecing-621221c40a42683a185b15b99c03fd6c8b6f7d90.tar.gz sitecing-621221c40a42683a185b15b99c03fd6c8b6f7d90.tar.bz2 | |
1. added missing include
2. fixed typo in Makefile
3. fixed zero-size output segfault
| -rw-r--r-- | include/sitecing/acomponent.h | 1 | ||||
| -rw-r--r-- | lib/sitecing_interface_cgi.cc | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/sitecing/acomponent.h b/include/sitecing/acomponent.h index 160e854..461f8a6 100644 --- a/include/sitecing/acomponent.h +++ b/include/sitecing/acomponent.h @@ -1,9 +1,10 @@ #ifndef __SITECING_ACOMPONENT_H #define __SITECING_ACOMPONENT_H +#include <cstdarg> #include "sitecing/sitecing_interface.h" /** * @file * @brief The acomponent class declaration. */ diff --git a/lib/sitecing_interface_cgi.cc b/lib/sitecing_interface_cgi.cc index 59ae25a..1acb23c 100644 --- a/lib/sitecing_interface_cgi.cc +++ b/lib/sitecing_interface_cgi.cc @@ -18,13 +18,15 @@ namespace sitecing { void sitecing_interface_cgi::flush(bool keep_buffering) { assert(cgigw); flush_headers(); if(is_buffering()) { streampos count = prebuffer.pubseekoff(0,ios_base::cur,ios_base::out); - cgigw->out().write(prebuffer.str().c_str(),count); + if(count>0) { + cgigw->out().write(prebuffer.str().c_str(),count); + } prebuffer.str(""); } cgigw->out().flush(); set_buffering(keep_buffering); } diff --git a/src/Makefile.am b/src/Makefile.am index 2ec650d..e6fb31a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ sitecing_build_DEPENDENCIES = ${top_builddir}/lib/libsitecing.la COPYING.cc: ${top_srcdir}/COPYING echo "const char * COPYING =" >$@ || (rm $@;exit 1) sed 's/"/\\"/g' $< | sed 's/^/\"/' | sed 's/$$/\\n\"/' >>$@ || (rm $@;exit 1) echo ";" >>$@ || (rm $@;exit 1) -EXTRA_DIST = ${sitecing_fastcgi_SOURCES} ${sitecing_PLAINCGI_SOURCES} +EXTRA_DIST = ${sitecing_fastcgi_SOURCES} ${sitecing_plaincgi_SOURCES} |