Attachment 34377 Details for Bug 60261 – Proposed patch

[patch] Proposed patch

patch_apache.diff (text/plain), 1.09 KB, created by Val on 2016-10-17 07:38:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val

Created: 2016-10-17 07:38:13 UTC

Size: 1.09 KB

patch

obsolete

>diff --git a/server/mpm_unix.c b/server/mpm_unix.c
>index 06318fe..0682ffd 100644
>--- a/server/mpm_unix.c
>+++ b/server/mpm_unix.c
>@@ -789,10 +789,17 @@ int ap_signal_server(int *exit_status, apr_pool_t *pconf)
>     }
>     else {
>         if (kill(otherpid, 0) == 0) {
>-            running = 1;
>-            status = apr_psprintf(pconf,
>-                                  "httpd (pid %" APR_PID_T_FMT ") already "
>-                                  "running", otherpid);
>+            if (getpid() == otherpid) {
>+                status = apr_psprintf(pconf,
>+                                      "httpd (pid %" APR_PID_T_FMT ") already "
>+                                      "running but it's ourself, can safely "
>+                                      "proceed", otherpid );
>+            }
>+            else {
>+                running = 1;
>+                status = apr_psprintf(pconf,
>+                                      "httpd (pid %" APR_PID_T_FMT ") already "
>+                                      "running", otherpid);
>+            }
>         }
>         else {
>             status = apr_psprintf(pconf,

Actions: View | Diff

Attachments on bug 60261: 34377 | 34378