diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-10-01 00:48:02 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-10-01 00:48:02 +0000 |
| commit | d9476f27a0e296f237ec65a9a4fda7b9d4911f4b (patch) | |
| tree | 1cf4874183e0cff9ba7182dcb05d410c71746ca0 /user/apache-httpd | |
| parent | f4cc6d8729916268ad5b96374f4a3466c837e5da (diff) | |
| parent | a7906406ecd52a1156f0f182b92a72be648f87b3 (diff) | |
| download | packages-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')
| -rw-r--r-- | user/apache-httpd/APKBUILD | 5 | ||||
| -rw-r--r-- | user/apache-httpd/conf/httpd.conf | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD index fddd11a12..e0e522f16 100644 --- a/user/apache-httpd/APKBUILD +++ b/user/apache-httpd/APKBUILD @@ -3,7 +3,7 @@ pkgname=apache-httpd _pkgreal=httpd pkgver=2.4.41 -pkgrel=0 +pkgrel=1 pkgdesc="Open-source HTTP server" url="https://httpd.apache.org" arch="all" @@ -70,6 +70,7 @@ build() { --enable-layout=Adelie \ --enable-so \ --with-mpm=event \ + --enable-mpms-shared="event prefork" \ --enable-mods-shared=reallyall \ --enable-ssl \ --disable-lua \ @@ -147,7 +148,7 @@ c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f0010 336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2 apache-httpd.confd 5762d53f39ce7ecd730e05ddf6c063ede65cd75b9e7d67217784c80366646491ef9474306e8eb119c8fb5b4358407b07636a4e9cd82325d8df4e3e00dabc3459 apache-httpd.initd 18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b apache-httpd.logrotate -cba279f31c12c3516bacf74856493c5a62a94017b3911d457b33e350af646b3e97632b15e396992e5115532c88c81fdd680a951ca0c71eb8a207f39d6c027c41 httpd.conf +d83681930c96fcecd2f7913044cebb7d8d9994fe1cb187a5cf58727935707cc43721d2f487f8adbccbbcf2ec6091d945d94ccb4eda1722c0ea341af3435d5f12 httpd.conf 83d57c57b809340bb07291c340ded5903ae55c0bba7c48e4eb0d27529ce4ecb6e235378ad770c69c8be2762b5346fa5bec94b6c585510719c37fe6addb33f998 alias.conf 7def0982bda42d5fe3a1812128be455fe0a47161f7fd0facd9ff85056f043a19f520bdb1c01b9f3fb25ddd66aa6224fb4b183f107bccd56719e0c7a88ad70bd9 http2.conf 9745ec511331b2ec399bf7895bc935f9c8526fd81d47cb17e42c1f5c010bbbea0b5ef2f2f4b12984dc8c77f410132010c3e73347a49ebe5feb0c1a763fe73a82 host.conf 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 |