Skip to content

Fix non-graceful termination of FastCGI apps on Windows #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: byte
Choose a base branch
from
Open

Fix non-graceful termination of FastCGI apps on Windows #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fac94e
This fixes a problem found with php-cgi.exe on Windows; it wouldn't t…
trawick Dec 1, 2013
0bfca49
Fix module log ids for all of mod_fastcgi. With the previous
trawick Dec 1, 2013
5772005
Close listen sockets in the process manager.
trawick Dec 1, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 11 additions & 19 deletions debian/patches/byte-compile-against-apache24.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
Index: libapache-mod-fastcgi/fcgi.h
===================================================================
--- libapache-mod-fastcgi.orig/fcgi.h 2012-03-07 14:29:04.005720240 +0100
+++ libapache-mod-fastcgi/fcgi.h 2012-03-07 14:29:07.830566657 +0100
@@ -34,6 +34,10 @@
--- libapache-mod-fastcgi.orig/fcgi.h 2008-09-22 06:36:06.000000000 -0400
+++ libapache-mod-fastcgi/fcgi.h 2013-12-01 10:17:42.480086695 -0500
@@ -34,6 +34,14 @@
#define APACHE2
#endif

+#ifdef AP_DECLARE_MODULE
+#define APACHE24
+#endif
+
+#ifdef APLOG_USE_MODULE
+APLOG_USE_MODULE(fastcgi);
+#endif
+
#ifdef APACHE2

#include <sys/stat.h>
@@ -57,10 +61,16 @@
@@ -57,10 +65,16 @@
#define XtOffsetOf APR_OFFSETOF
#define ap_select select

Expand All @@ -30,7 +34,7 @@ Index: libapache-mod-fastcgi/fcgi.h

#ifndef S_ISDIR
#define S_ISDIR(m) (((m)&(S_IFMT)) == (S_IFDIR))
@@ -365,42 +375,42 @@
@@ -354,42 +368,42 @@
#ifdef APACHE2

#ifdef WIN32
Expand Down Expand Up @@ -110,8 +114,8 @@ Index: libapache-mod-fastcgi/fcgi.h

Index: libapache-mod-fastcgi/mod_fastcgi.c
===================================================================
--- libapache-mod-fastcgi.orig/mod_fastcgi.c 2012-03-07 14:29:04.017047773 +0100
+++ libapache-mod-fastcgi/mod_fastcgi.c 2012-03-07 14:29:07.841272721 +0100
--- libapache-mod-fastcgi.orig/mod_fastcgi.c 2008-11-09 09:31:03.000000000 -0500
+++ libapache-mod-fastcgi/mod_fastcgi.c 2013-12-01 10:16:51.472085611 -0500
@@ -97,6 +97,10 @@
} while (0)
#endif
Expand All @@ -123,15 +127,3 @@ Index: libapache-mod-fastcgi/mod_fastcgi.c
/*
* Global variables
*/
@@ -3014,7 +3018,11 @@
ap_hook_fixups(fixups, NULL, NULL, APR_HOOK_MIDDLE);
}

+#ifdef APACHE24
+AP_DECLARE_MODULE(fastcgi) =
+#else
module AP_MODULE_DECLARE_DATA fastcgi_module =
+#endif
{
STANDARD20_MODULE_STUFF,
fcgi_config_create_dir_config, /* per-directory config creator */
3 changes: 2 additions & 1 deletion fcgi_pm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@ static void shutdown_all()
/* Send KILL to all processes */
for (i = 0; i < numChildren; i++, proc++)
{
if (proc->state == FCGI_RUNNING_STATE)
if (proc->state == FCGI_RUNNING_STATE
|| proc->state == FCGI_VICTIM_STATE)
{
fcgi_kill(proc, SIGKILL);
}
Expand Down
1 change: 1 addition & 0 deletions mod_fastcgi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ static apcb_t init_module(server_rec *s, pool *p)
if (rv == APR_INCHILD)
{
/* child */
ap_close_listeners();
fcgi_pm_main(NULL);
exit(1);
}
Expand Down