View | Details | Raw Unified | Return to bug 60261
Collapse All | Expand All

(-)a/server/mpm_unix.c (-4 / +12 lines)
Lines 789-798 int ap_signal_server(int *exit_status, apr_pool_t *pconf) Link Here
789
    }
789
    }
790
    else {
790
    else {
791
        if (kill(otherpid, 0) == 0) {
791
        if (kill(otherpid, 0) == 0) {
792
            running = 1;
792
            if (getpid() == otherpid) {
793
            status = apr_psprintf(pconf,
793
                status = apr_psprintf(pconf,
794
                                  "httpd (pid %" APR_PID_T_FMT ") already "
794
                                      "httpd (pid %" APR_PID_T_FMT ") already "
795
                                  "running", otherpid);
795
                                      "running but it's ourself, can safely "
796
                                      "proceed", otherpid );
797
            }
798
            else {
799
                running = 1;
800
                status = apr_psprintf(pconf,
801
                                      "httpd (pid %" APR_PID_T_FMT ") already "
802
                                      "running", otherpid);
803
            }
796
        }
804
        }
797
        else {
805
        else {
798
            status = apr_psprintf(pconf,
806
            status = apr_psprintf(pconf,

Return to bug 60261