SecBSD's official ports repository
This commit is contained in:
commit
2c0afcbbf3
64331 changed files with 5339189 additions and 0 deletions
45
www/apache-httpd/patches/patch-server_mpm_unix_c
Normal file
45
www/apache-httpd/patches/patch-server_mpm_unix_c
Normal file
|
@ -0,0 +1,45 @@
|
|||
Index: server/mpm_unix.c
|
||||
--- server/mpm_unix.c.orig
|
||||
+++ server/mpm_unix.c
|
||||
@@ -796,7 +796,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
|
||||
*exit_status = 1;
|
||||
return 1;
|
||||
}
|
||||
- status = "httpd (no pid file) not running";
|
||||
+ status = "httpd2 (no pid file) not running";
|
||||
}
|
||||
else {
|
||||
/* With containerization, httpd may get the same PID at each startup,
|
||||
@@ -805,12 +805,12 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
|
||||
if (otherpid != getpid() && kill(otherpid, 0) == 0) {
|
||||
running = 1;
|
||||
status = apr_psprintf(pconf,
|
||||
- "httpd (pid %" APR_PID_T_FMT ") already "
|
||||
+ "httpd2 (pid %" APR_PID_T_FMT ") already "
|
||||
"running", otherpid);
|
||||
}
|
||||
else {
|
||||
status = apr_psprintf(pconf,
|
||||
- "httpd (pid %" APR_PID_T_FMT "?) not running",
|
||||
+ "httpd2 (pid %" APR_PID_T_FMT "?) not running",
|
||||
otherpid);
|
||||
}
|
||||
}
|
||||
@@ -834,7 +834,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
|
||||
|
||||
if (!strcmp(dash_k_arg, "restart")) {
|
||||
if (!running) {
|
||||
- printf("httpd not running, trying to start\n");
|
||||
+ printf("httpd2 not running, trying to start\n");
|
||||
}
|
||||
else {
|
||||
*exit_status = send_signal(otherpid, SIGHUP);
|
||||
@@ -844,7 +844,7 @@ int ap_signal_server(int *exit_status, apr_pool_t *pco
|
||||
|
||||
if (!strcmp(dash_k_arg, "graceful")) {
|
||||
if (!running) {
|
||||
- printf("httpd not running, trying to start\n");
|
||||
+ printf("httpd2 not running, trying to start\n");
|
||||
}
|
||||
else {
|
||||
*exit_status = send_signal(otherpid, AP_SIG_GRACEFUL);
|
Loading…
Add table
Add a link
Reference in a new issue