summaryrefslogtreecommitdiff
path: root/user/apache-httpd/conf
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-10-01 00:48:02 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-10-01 00:48:02 +0000
commitd9476f27a0e296f237ec65a9a4fda7b9d4911f4b (patch)
tree1cf4874183e0cff9ba7182dcb05d410c71746ca0 /user/apache-httpd/conf
parentf4cc6d8729916268ad5b96374f4a3466c837e5da (diff)
parenta7906406ecd52a1156f0f182b92a72be648f87b3 (diff)
downloadpackages-d9476f27a0e296f237ec65a9a4fda7b9d4911f4b.tar.gz
packages-d9476f27a0e296f237ec65a9a4fda7b9d4911f4b.tar.bz2
packages-d9476f27a0e296f237ec65a9a4fda7b9d4911f4b.tar.xz
packages-d9476f27a0e296f237ec65a9a4fda7b9d4911f4b.zip
Merge branch 'popular-demand' into 'master'
Popular demand (round 2) See merge request adelie/packages!346
Diffstat (limited to 'user/apache-httpd/conf')
-rw-r--r--user/apache-httpd/conf/httpd.conf8
1 files changed, 8 insertions, 0 deletions
diff --git a/user/apache-httpd/conf/httpd.conf b/user/apache-httpd/conf/httpd.conf
index 7fe8adfdf..bada89139 100644
--- a/user/apache-httpd/conf/httpd.conf
+++ b/user/apache-httpd/conf/httpd.conf
@@ -11,6 +11,14 @@ ServerTokens Prod
# What IP/port to listen on. By default, listens to port 80 on all IPs.
Listen 80
+# Only ONE of the following modules should be uncommented to select the
+# Multi-Processing Module that Apache should use to handle connections.
+# Read More: https://httpd.apache.org/docs/2.4/mpm.html
+# Adélie Linux enables mpm_event by default, as it performs better
+# than mpm_prefork for most use cases.
+LoadModule mpm_event_module /usr/libexec/apache2/mod_mpm_event.so
+#LoadModule mpm_prefork_module /usr/libexec/apache2/mod_mpm_prefork.so
+
# The rest of these modules are required for basic operations.
LoadModule log_config_module /usr/libexec/apache2/mod_log_config.so
LoadModule mime_module /usr/libexec/apache2/mod_mime.so