|
 |
9c4fd61 |
From 36c7c9397150af95e6f0656243a0ed13d05e7017 Mon Sep 17 00:00:00 2001
|
|
|
9c4fd61 |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
9c4fd61 |
Date: Mon, 26 Nov 2018 09:30:16 +0100
|
|
|
9c4fd61 |
Subject: [PATCH] Update Apache 2 handler tests to httpd 2.4
|
|
|
9c4fd61 |
MIME-Version: 1.0
|
|
|
9c4fd61 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9c4fd61 |
Content-Transfer-Encoding: 8bit
|
|
|
9c4fd61 |
|
|
|
9c4fd61 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
9c4fd61 |
---
|
|
|
9c4fd61 |
t/Plack-Handler/apache2-registry.t | 7 +++++--
|
|
|
9c4fd61 |
t/Plack-Handler/apache2.t | 21 +++++++++++++++------
|
|
|
9c4fd61 |
2 files changed, 20 insertions(+), 8 deletions(-)
|
|
|
9c4fd61 |
|
|
|
9c4fd61 |
diff --git a/t/Plack-Handler/apache2-registry.t b/t/Plack-Handler/apache2-registry.t
|
|
|
9c4fd61 |
index b6ab542..bd44b7c 100644
|
|
|
9c4fd61 |
--- a/t/Plack-Handler/apache2-registry.t
|
|
|
9c4fd61 |
+++ b/t/Plack-Handler/apache2-registry.t
|
|
|
9c4fd61 |
@@ -94,11 +94,14 @@ EOF
|
|
|
9c4fd61 |
sub _render_conf {
|
|
|
9c4fd61 |
my ($tmpdir, $port) = @_;
|
|
|
9c4fd61 |
<<"END";
|
|
|
9c4fd61 |
-LoadModule perl_module libexec/apache2/mod_perl.so
|
|
|
9c4fd61 |
+LoadModule unixd_module modules/mod_unixd.so
|
|
|
9c4fd61 |
+LoadModule authn_core_module modules/mod_authn_core.so
|
|
|
9c4fd61 |
+LoadModule authz_core_module modules/mod_authz_core.so
|
|
|
9c4fd61 |
+LoadModule mpm_event_module modules/mod_mpm_event.so
|
|
|
9c4fd61 |
+LoadModule perl_module modules/mod_perl.so
|
|
|
9c4fd61 |
ServerRoot $tmpdir
|
|
|
9c4fd61 |
DocumentRoot $tmpdir
|
|
|
9c4fd61 |
PidFile $tmpdir/httpd.pid
|
|
|
9c4fd61 |
-LockFile $tmpdir/httpd.lock
|
|
|
9c4fd61 |
ErrorLog $tmpdir/error_log
|
|
|
9c4fd61 |
Listen $port
|
|
|
9c4fd61 |
|
|
|
9c4fd61 |
diff --git a/t/Plack-Handler/apache2.t b/t/Plack-Handler/apache2.t
|
|
|
9c4fd61 |
index f5ea803..701dcf3 100644
|
|
|
9c4fd61 |
--- a/t/Plack-Handler/apache2.t
|
|
|
9c4fd61 |
+++ b/t/Plack-Handler/apache2.t
|
|
|
9c4fd61 |
@@ -55,11 +55,14 @@ EOF
|
|
|
9c4fd61 |
sub _render_conf {
|
|
|
9c4fd61 |
my ($tmpdir, $port, $psgi_path) = @_;
|
|
|
9c4fd61 |
<<"END";
|
|
|
9c4fd61 |
-LoadModule perl_module libexec/apache2/mod_perl.so
|
|
|
9c4fd61 |
+LoadModule unixd_module modules/mod_unixd.so
|
|
|
9c4fd61 |
+LoadModule authn_core_module modules/mod_authn_core.so
|
|
|
9c4fd61 |
+LoadModule authz_core_module modules/mod_authz_core.so
|
|
|
9c4fd61 |
+LoadModule mpm_event_module modules/mod_mpm_event.so
|
|
|
9c4fd61 |
+LoadModule perl_module modules/mod_perl.so
|
|
|
9c4fd61 |
ServerRoot $tmpdir
|
|
|
9c4fd61 |
DocumentRoot $tmpdir
|
|
|
9c4fd61 |
PidFile $tmpdir/httpd.pid
|
|
|
9c4fd61 |
-LockFile $tmpdir/httpd.lock
|
|
|
9c4fd61 |
ErrorLog $tmpdir/error_log
|
|
|
9c4fd61 |
Listen $port
|
|
|
9c4fd61 |
|
|
|
9c4fd61 |
@@ -79,11 +82,14 @@ END
|
|
|
9c4fd61 |
sub _render_conf_location {
|
|
|
9c4fd61 |
my ($tmpdir, $port, $psgi_path) = @_;
|
|
|
9c4fd61 |
<<"END";
|
|
|
9c4fd61 |
-LoadModule perl_module libexec/apache2/mod_perl.so
|
|
|
9c4fd61 |
+LoadModule unixd_module modules/mod_unixd.so
|
|
|
9c4fd61 |
+LoadModule authn_core_module modules/mod_authn_core.so
|
|
|
9c4fd61 |
+LoadModule authz_core_module modules/mod_authz_core.so
|
|
|
9c4fd61 |
+LoadModule mpm_event_module modules/mod_mpm_event.so
|
|
|
9c4fd61 |
+LoadModule perl_module modules/mod_perl.so
|
|
|
9c4fd61 |
ServerRoot $tmpdir
|
|
|
9c4fd61 |
DocumentRoot $tmpdir
|
|
|
9c4fd61 |
PidFile $tmpdir/httpd.pid
|
|
|
9c4fd61 |
-LockFile $tmpdir/httpd.lock
|
|
|
9c4fd61 |
ErrorLog $tmpdir/error_log
|
|
|
9c4fd61 |
Listen $port
|
|
|
9c4fd61 |
|
|
|
9c4fd61 |
@@ -103,11 +109,14 @@ END
|
|
|
9c4fd61 |
sub _render_conf_location_match {
|
|
|
9c4fd61 |
my ($tmpdir, $port, $psgi_path) = @_;
|
|
|
9c4fd61 |
<<"END";
|
|
|
9c4fd61 |
-LoadModule perl_module libexec/apache2/mod_perl.so
|
|
|
9c4fd61 |
+LoadModule unixd_module modules/mod_unixd.so
|
|
|
9c4fd61 |
+LoadModule authn_core_module modules/mod_authn_core.so
|
|
|
9c4fd61 |
+LoadModule authz_core_module modules/mod_authz_core.so
|
|
|
9c4fd61 |
+LoadModule mpm_event_module modules/mod_mpm_event.so
|
|
|
9c4fd61 |
+LoadModule perl_module modules/mod_perl.so
|
|
|
9c4fd61 |
ServerRoot $tmpdir
|
|
|
9c4fd61 |
DocumentRoot $tmpdir
|
|
|
9c4fd61 |
PidFile $tmpdir/httpd.pid
|
|
|
9c4fd61 |
-LockFile $tmpdir/httpd.lock
|
|
|
9c4fd61 |
ErrorLog $tmpdir/error_log
|
|
|
9c4fd61 |
Listen $port
|
|
|
9c4fd61 |
|
|
|
9c4fd61 |
--
|
|
|
9c4fd61 |
2.17.2
|
|
|
9c4fd61 |
|