debpkg/fcgi-cgi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge fcgi-cgi 0.2.1 into debian

Browse Source
This commit is contained in:
Stefan Bühler 2013-05-23 18:01:49 +02:00
commit c00f2bba96
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -22,7 +22,7 @@ MACRO(ADD_TARGET_PROPERTIES _target _name _properties)
ENDMACRO(ADD_TARGET_PROPERTIES) ENDMACRO(ADD_TARGET_PROPERTIES)
PROJECT(fcgi-cgi C) PROJECT(fcgi-cgi C)
SET(PACKAGE_VERSION 0.2.0) SET(PACKAGE_VERSION 0.2.1)
IF("${CMAKE_BUILD_TYPE}" STREQUAL "") IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "") ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")

2
configure.ac
View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AC_INIT([fcgi-cgi], [0.2.0], [lighttpd@stbuehler.de]) AC_INIT([fcgi-cgi], [0.2.1], [lighttpd@stbuehler.de])
AC_CONFIG_SRCDIR([fcgi-cgi.c]) AC_CONFIG_SRCDIR([fcgi-cgi.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])

1
fastcgi.c
View File

@ -801,6 +801,7 @@ void fastcgi_end_request(fastcgi_connection *fcon, gint32 appStatus, enum FCGI_P
if (0 == fcon->requestID) return; if (0 == fcon->requestID) return;
stream_send_end_request(&fcon->write_queue, fcon->requestID, appStatus, status); stream_send_end_request(&fcon->write_queue, fcon->requestID, appStatus, status);
fcon->requestID = 0; fcon->requestID = 0;
fastcgi_connection_environ_clear(fcon);
if (!had_data) write_queue(fcon); if (!had_data) write_queue(fcon);
} }

4
fcgi-cgi.c
View File

@ -460,7 +460,11 @@ static void fcgi_cgi_received_stdin(fastcgi_connection *fcon, GByteArray *data)
if (data) g_byte_array_free(data, TRUE); if (data) g_byte_array_free(data, TRUE);
return; return;
} }
if (NULL != data) {
fastcgi_queue_append_bytearray(&cld->write_queue, data); fastcgi_queue_append_bytearray(&cld->write_queue, data);
} else {
cld->write_queue.closed = TRUE;
}
write_queue(cld); /* if we don't call this we have to check the write-queue length */ write_queue(cld); /* if we don't call this we have to check the write-queue length */
} }