mirror of
https://git.freebsd.org/ports.git
synced 2025-05-20 02:53:10 -04:00
5391a9beb2
- change MPM backend from static to dynamic, but keep mpm_prefork for compatiblity with e.g. php modules - install dedicated MPM load file in case httpd was build with modular MPM (modules.d/000_mpm_prefork_fallback.conf) - disable SSLv3 and SSLv2 fallback in sample httpd-ssl-conf - use @sample macro instead EXAMPLESDIR - add some SSLCipherSuite examples for OpenSSL >= 1.0.x - add libressl support [1] - add pkg-install script (to handle new modular MPM build) - build now most all modules, so users using packages don't have to run a custom build for missing modules - fix suexec mode PR: 196139 [1] MFH: 2015Q1
27 lines
1.3 KiB
Text
27 lines
1.3 KiB
Text
--- support/apxs.in.orig 2013-12-26 18:01:53 UTC
|
|
+++ support/apxs.in
|
|
@@ -636,7 +636,13 @@ if ($opt_i or $opt_e) {
|
|
}
|
|
} else {
|
|
# replace already existing LoadModule line
|
|
- $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s;
|
|
+ # Custom FreeBSD mod
|
|
+ if ($opt_A) {
|
|
+ $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1|s;
|
|
+ }
|
|
+ else {
|
|
+ $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s;
|
|
+ }
|
|
}
|
|
$lmd =~ m|LoadModule\s+(.+?)_module.*|;
|
|
notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]");
|
|
@@ -645,8 +651,7 @@ if ($opt_i or $opt_e) {
|
|
if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) {
|
|
print FP $content;
|
|
close(FP);
|
|
- system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " .
|
|
- "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
|
|
+ system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " .
|
|
"rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new");
|
|
} else {
|
|
notice("unable to open configuration file");
|