Attachment #126220 for bug #169958

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

Lines 1-4 Link Here

(-)Makefile.options (+4 lines)
1	OPTIONS+= \	1	OPTIONS+= \
		2	MPM_WORKER "Enable worker MPM module" OFF \
		3	MPM_ITK "Enable EXPERIMENTAL itk MPM module" OFF \
		4	MPM_EVENT "Enable EXPERIMENTAL event MPM module" OFF \
		5	MPM_PERUSER "Enable EXPERIMENTAL peruser MPM module" OFF \
2	AUTH_BASIC "Enable mod_auth_basic" ON \	6	AUTH_BASIC "Enable mod_auth_basic" ON \
3	AUTH_DIGEST "Enable mod_auth_digest" ON \	7	AUTH_DIGEST "Enable mod_auth_digest" ON \
4	AUTHN_FILE "Enable mod_authn_file" ON \	8	AUTHN_FILE "Enable mod_authn_file" ON \





.endif

. if (!defined(WITH_MPM_WORKER) && !defined(WITH_MPM_ITK) && !defined(WITH_MPM_EVENT) && !defined (WITH_MPM_PERUSER))
PLIST_SUB+=	PREFORK="" WORKER="@comment " EVENT="@comment "
.endif

.if defined(_PREMKINCLUDED)
# MPM section:
.if defined(WITH_MPM_WORKER)
. if (defined(WITH_MPM_ITK) || defined(WITH_MPM_EVENT) || defined (WITH_MPM_PERUSER))
IGNORE+=        Select only one MPM module to compile.
. endif
. if (!defined(WITH_THREADS))
IGNORE+= mpm_worker requires WITH_THREADS.
. endif
.   if ${WITH_MPM} != "itk"
WITH_THREADS=		yes
WITH_THREADS_MODULES=	yes
WITHOUT_MODULES+=	cgi
.   endif
.      if ${WITH_MPM:L} == "worker"
PLIST_SUB+=	PREFORK="@comment " WORKER="" EVENT="@comment "
WITH_MPM= worker
WITHOUT_MODULES+=     cgi
.endif

.if defined(WITH_MPM_ITK)
. if (defined(WITH_MPM_EVENT) || defined (WITH_MPM_PERUSER))
IGNORE+=        Select only one MPM module to compile.
. endif
. if defined(WITH_THREADS)
IGNORE+=        mpm_itk conflicts with WITH_THREADS option.
. endif
PLIST_SUB+=	PREFORK="@comment " WORKER="@comment " EVENT="@comment "
WITH_MPM= itk
EXTRA_PATCHES+=       ${.CURDIR}/files/mpm-itk-${MPM_ITK_VERSION}
EXTRA_PATCHES+=       ${.CURDIR}/files/mpm-itk-perdir-regex
.endif

.if defined(WITH_MPM_EVENT)
. if defined (WITH_MPM_PERUSER)
IGNORE+=        Select only one MPM module to compile.
. endif
. if (!defined(WITH_THREADS))
IGNORE+= mpm_event requires WITH_THREADS.
. endif
PLIST_SUB+=	PREFORK="@comment " WORKER="@comment " EVENT=""
WITHOUT_MODULES+=     cgi
WITH_MPM= event
.endif

.if defined(WITH_MPM_PERUSER)
. if (!defined(WITH_THREADS))
IGNORE+= mpm_event requires WITH_THREADS.
. endif
#PLIST_SUB+=	PREFORK="@comment " WORKER="@comment " THREADPOOL="@comment " EVENT="@comment "
PLIST_SUB+=	PREFORK="@comment " WORKER="@comment " EVENT="@comment "
WITHOUT_MODULES+=     cgi
WITH_MPM= peruser
WITH_SLAVE_MPM= peruser
EXTRA_PATCHES+=         ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0.patch
EXTRA_PATCHES+=         ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0-dc3.patch
EXTRA_PATCHES+=         ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0-dc3-r57.patch
.endif

# xDBM section

Return to bug 169958

Lines 44-81 Link Here

(-)Makefile.modules (-27 / +50 lines)
44		44
45	.endif	45	.endif
46		46
		47	. if (!defined(WITH_MPM_WORKER) && !defined(WITH_MPM_ITK) && !defined(WITH_MPM_EVENT) && !defined (WITH_MPM_PERUSER))
		48	PLIST_SUB+= PREFORK="" WORKER="@comment " EVENT="@comment "
		49	.endif
		50
47	.if defined(_PREMKINCLUDED)	51	.if defined(_PREMKINCLUDED)
48	# MPM section:	52	# MPM section:
49	# << TO BE WRITTEN >>	53	.if defined(WITH_MPM_WORKER)
50	.if defined (SLAVE_PORT_MPM)	54	. if (defined(WITH_MPM_ITK) \|\| defined(WITH_MPM_EVENT) \|\| defined (WITH_MPM_PERUSER))
51	PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT="@comment "	55	IGNORE+= Select only one MPM module to compile.
52	PKGNAMESUFFIX= -${SLAVE_PORT_MPM}	56	. endif
53	.else	57	. if (!defined(WITH_THREADS))
54	. if ${WITH_MPM} != "prefork"	58	IGNORE+= mpm_worker requires WITH_THREADS.
55	PKGNAMESUFFIX= -${WITH_MPM:L}	59	. endif
56	. if ${WITH_MPM} != "itk"
57	WITH_THREADS= yes
58	WITH_THREADS_MODULES= yes
59	WITHOUT_MODULES+= cgi
60	. endif
61	. if ${WITH_MPM:L} == "worker"
62	PLIST_SUB+= PREFORK="@comment " WORKER="" EVENT="@comment "	60	PLIST_SUB+= PREFORK="@comment " WORKER="" EVENT="@comment "
63	. elif ${WITH_MPM:L} == "event"	61	WITH_MPM= worker
64	PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT=""	62	WITHOUT_MODULES+= cgi
65	. elif ${WITH_MPM:L} == "itk"	63	.endif
		64
		65	.if defined(WITH_MPM_ITK)
		66	. if (defined(WITH_MPM_EVENT) \|\| defined (WITH_MPM_PERUSER))
		67	IGNORE+= Select only one MPM module to compile.
		68	. endif
		69	. if defined(WITH_THREADS)
		70	IGNORE+= mpm_itk conflicts with WITH_THREADS option.
		71	. endif
66	PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT="@comment "	72	PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT="@comment "
67	EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-${MPM_ITK_VERSION}	73	WITH_MPM= itk
68	. if defined (WITH_ITK_PERDIR_REGEX)	74	EXTRA_PATCHES+= ${.CURDIR}/files/mpm-itk-${MPM_ITK_VERSION}
69	EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-perdir-regex	75	EXTRA_PATCHES+= ${.CURDIR}/files/mpm-itk-perdir-regex
70	. endif	76	.endif
71	. else	77
72	IGNORE= "Unknown MPM: ${WITH_MPM}"	78	.if defined(WITH_MPM_EVENT)
73	. endif	79	. if defined (WITH_MPM_PERUSER)
74	. else	80	IGNORE+= Select only one MPM module to compile.
75	PLIST_SUB+= PREFORK="@comment " WORKER="@comment " THREADPOOL="@comment " EVENT="@comment "	81	. endif
76	. endif	82	. if (!defined(WITH_THREADS))
77	.else	83	IGNORE+= mpm_event requires WITH_THREADS.
		84	. endif
		85	PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT=""
		86	WITHOUT_MODULES+= cgi
		87	WITH_MPM= event
		88	.endif
		89
		90	.if defined(WITH_MPM_PERUSER)
		91	. if (!defined(WITH_THREADS))
		92	IGNORE+= mpm_event requires WITH_THREADS.
		93	. endif
		94	#PLIST_SUB+= PREFORK="@comment " WORKER="@comment " THREADPOOL="@comment " EVENT="@comment "
78	PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT="@comment "	95	PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT="@comment "
		96	WITHOUT_MODULES+= cgi
		97	WITH_MPM= peruser
		98	WITH_SLAVE_MPM= peruser
		99	EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0.patch
		100	EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0-dc3.patch
		101	EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0-dc3-r57.patch
79	.endif	102	.endif
80		103
81	# xDBM section	104	# xDBM section