Ticket #1019: lighttpd-1.4.13-pidfile.patch

src/server.c

@@ -1231 +1231 @@
                                                 srv_socket->fd = -1;
 
                                                 /* network_close() will cleanup after us */
+
+                                                if (srv->srvconf.pid_file->used &&
+                                                    srv->srvconf.changeroot->used == 0) {
+                                                        if (0 != unlink(srv->srvconf.pid_file->ptr)) {
+                                                                if (errno != EACCES && errno != EPERM) {
+                                                                        log_error_write(srv, __FILE__, __LINE__, "sbds",
+                                                                                        "unlink failed for:",
+                                                                                        srv->srvconf.pid_file,
+                                                                                        errno,
+                                                                                        strerror(errno));
+                                                                }
+                                                        }
+                                                }
                                         }
                                 }
 
@@ -1335 +1348 @@
         }
 
         if (srv->srvconf.pid_file->used &&
-            srv->srvconf.changeroot->used == 0) {
+            srv->srvconf.changeroot->used == 0 &&
+            0 == graceful_shutdown) {
                 if (0 != unlink(srv->srvconf.pid_file->ptr)) {
                         if (errno != EACCES && errno != EPERM) {
                                 log_error_write(srv, __FILE__, __LINE__, "sbds",