Changeset 1745

Timestamp:

04/10/2007 05:08:11 PM (17 months ago)

Author:

darix

Message:

- added "kill-signal" as setting for fastcgi blocks. applications

linking libfcgi should be killed with SIGUSR1. The default value will
remain SIGTERM though. If you want to change it add:
'"kill-signal" => 10,' in your fastcgi block.

Files:

• branches/lighttpd-1.4.x/src/mod_fastcgi.c (modified) (7 diffs)

branches/lighttpd-1.4.x/src/mod_fastcgi.c

@@ -251 +251 @@
 
         buffer *strip_request_uri;
+
+        unsigned short kill_signal; /* we need a setting for this as libfcgi
+                                       applications prefer SIGUSR1 while the
+                                       rest of the world would use SIGTERM
+                                       *sigh* */
 } fcgi_extension_host;
 
@@ -652 +657 @@
                                         for (proc = host->first; proc; proc = proc->next) {
                                                 if (proc->pid != 0) {
-                                                        /* libfcgi wants SIGUSR1 for killing */
-                                                        kill(proc->pid, SIGUSR1);
-                                                        kill(proc->pid, SIGTERM);
+                                                        kill(proc->pid, host->kill_signal);
                                                 }
 
@@ -665 +668 @@
                                         for (proc = host->unused_procs; proc; proc = proc->next) {
                                                 if (proc->pid != 0) {
-                                                        /* libfcgi wants SIGUSR1 for killing */
-                                                        kill(proc->pid, SIGUSR1);
-                                                        kill(proc->pid, SIGTERM);
+                                                        kill(proc->pid, host->kill_signal);
                                                 }
                                                 if (proc->is_local &&
@@ -1033 +1034 @@
                                                         "in the output, NOT (cgi) NOR (cli)\n"
                                                         "For more information check http://www.lighttpd.net/documentation/fastcgi.html#preparing-php-as-a-fastcgi-program");
-                                        log_error_write(srv, __FILE__, __LINE__, "s",
-                                                        "If this is PHP on Gentoo add fastcgi to the USE flags");
                                 } else if (WIFSIGNALED(status)) {
                                         log_error_write(srv, __FILE__, __LINE__, "sd",
@@ -1186 +1185 @@
 
                                                 { "broken-scriptfilename", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },  /* 14 */
-                                                { "allow-x-send-file", NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },      /* 15 */
+                                                { "allow-x-send-file",  NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },      /* 15 */
                                                 { "strip-request-uri",  NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },      /* 16 */
+                                                { "kill-signal",        NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },      /* 17 */
 
                                                 { NULL,                NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
@@ -1214 +1214 @@
                                         host->break_scriptfilename_for_php = 0;
                                         host->allow_xsendfile = 0; /* handle X-LIGHTTPD-send-file */
+                                        host->kill_signal = SIGTERM;
 
                                         fcv[0].destination = host->host;
@@ -1234 +1235 @@
                                         fcv[15].destination = &(host->allow_xsendfile);
                                         fcv[16].destination = host->strip_request_uri;
+                                        fcv[17].destination = &(host->kill_signal);
 
                                         if (0 != config_insert_values_internal(srv, da_host->value, fcv)) {