Le 16/11/2013 20:24, [email protected] a écrit :
Author: minfrin
Date: Sat Nov 16 19:24:53 2013
New Revision: 1542557
URL: http://svn.apache.org/r1542557
Log:
mpm_unix: Add ap_mpm_podx_* implementation to avoid code duplication
and align w/ trunk.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1409214
http://svn.apache.org/viewvc?view=revision&revision=1410004
2.4.x patch: http://people.apache.org/~jim/patches/httpd-2.4-podx-v2.patch
Submitted by: jim
Reviewed by: rjung, minfrin
Removed:
httpd/httpd/branches/2.4.x/server/mpm/event/pod.c
httpd/httpd/branches/2.4.x/server/mpm/event/pod.h
httpd/httpd/branches/2.4.x/server/mpm/worker/pod.c
httpd/httpd/branches/2.4.x/server/mpm/worker/pod.h
Modified:
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/include/ap_mmn.h
httpd/httpd/branches/2.4.x/include/mpm_common.h
httpd/httpd/branches/2.4.x/server/mpm/event/config3.m4
httpd/httpd/branches/2.4.x/server/mpm/event/event.c
httpd/httpd/branches/2.4.x/server/mpm/worker/config3.m4
httpd/httpd/branches/2.4.x/server/mpm/worker/worker.c
httpd/httpd/branches/2.4.x/server/mpm_unix.c
r1526220 has been backported as r1528962 in 2.4.x
The difference between the two, is that the first one uses
AP_MPM_PODX_GRACEFUL around line 1367, and the second uses AP_GRACEFUL.
AP_GRACEFUL was defined in event/pod.h and worker/pod.h whiche have been
deleted. With the above patch, AP_GRACEFUL is no more defined.
So server/mpm/worker/worker.c in 2.4.x should be updated accordingly.
Patch attached for review.
Best regards,
CJ
diff -rup -X my_diff_httpd_exclude.txt server/mpm/worker/worker.c
server/mpm/worker/worker.c
--- server/mpm/worker/worker.c 2013-11-16 22:58:26.539808912 +0100
+++ server/mpm/worker/worker.c 2013-09-27 21:01:05.681627931 +0200
@@ -1368,7 +1368,7 @@ static void child_main(int child_num_arg
* they have (then cleans up).
*/
join_workers(ts->listener, threads,
- rv == AP_GRACEFUL ? ST_GRACEFUL : ST_UNGRACEFUL);
+ rv == AP_MPM_PODX_GRACEFUL ? ST_GRACEFUL : ST_UNGRACEFUL);
}
free(threads);
