Changeset 2198 for branches/lighttpd-1.4.x

Timestamp:

07/14/2008 03:45:05 PM (8 weeks ago)

Author:

glen

Message:

- let spawn-fcgi propagate exit code from spawned fcgi application

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/spawn-fcgi.c (modified) (3 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -27 +27 @@
   * Implement a clean way to open /dev/null and use it to close stdin/out/err in the needed places (#624)
   * merge spawn-fcgi changes from trunk (from @2191)
+  * let spawn-fcgi propagate exit code from spawned fcgi application
 
 - 1.4.19 - 2008-03-10

branches/lighttpd-1.4.x/src/spawn-fcgi.c

@@ -40 +40 @@
 int fcgi_spawn_connection(char *appPath, char **appArgv, char *addr, unsigned short port, const char *unixsocket, int fork_count, int child_count, int pid_fd, int nofork) {
         int fcgi_fd;
-        int socket_type, status;
+        int socket_type, status, rc = 0;
         struct timeval tv = { 0, 100 * 1000 };
 
@@ -228 +228 @@
                                                 fprintf(stderr, "%s.%d: child exited with: %d\n",
                                                         __FILE__, __LINE__, WEXITSTATUS(status));
+                                                rc = WEXITSTATUS(status);
                                         } else if (WIFSIGNALED(status)) {
                                                 fprintf(stderr, "%s.%d: child signaled: %d\n",
                                                         __FILE__, __LINE__,
                                                         WTERMSIG(status));
+                                                rc = 1;
                                         } else {
                                                 fprintf(stderr, "%s.%d: child died somehow: %d\n",
                                                         __FILE__, __LINE__,
                                                         status);
+                                                rc = status;
                                         }
                                 }
@@ -252 +255 @@
         close(fcgi_fd);
 
-        return 0;
+        return rc;
 }