Changeset 1656

Timestamp:

02/17/2007 06:17:00 PM (1 year ago)

Author:

glen

Message:

- prevent wrong pidfile unlinking on graceful restart (patch by Chris Webb)

Files:

• branches/lighttpd-1.4.x/src/server.c (modified) (2 diffs)

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

@@ -1233 +1233 @@
-
-                                                /* 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));
+                                                                }
+                                                        }
+                                                }
-                                        }
-                                }
@@ -1337 +1350 @@
-
-        if (srv->srvconf.pid_file->used &&
-
+
+
-                if (0 != unlink(srv->srvconf.pid_file->ptr)) {
-                        if (errno != EACCES && errno != EPERM) {