From 8420ec484f51317ce23627ca3f7a88455ee9fbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 26 Feb 2013 11:13:29 +0100 Subject: [PATCH] Apache 2.4 support --- lib/Mogstored/HTTPServer/Apache.pm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/Mogstored/HTTPServer/Apache.pm b/lib/Mogstored/HTTPServer/Apache.pm index 532b335..3dfd30f 100644 --- a/lib/Mogstored/HTTPServer/Apache.pm +++ b/lib/Mogstored/HTTPServer/Apache.pm @@ -37,16 +37,22 @@ sub start { my ($fh, $filename) = File::Temp::tempfile(); $self->{temp_conf_file} = $filename; + $self->{temp_pid_directory} = File::Temp::tempdir(CLEANUP => 1); my $portnum = $self->listen_port; my $bind_ip = $self->bind_ip; print $fh qq{ -ServerType standalone ErrorLog /dev/null -LoadModule dav_module /usr/lib/apache/1.3/libdav.so +PidFile $self->{temp_pid_directory}/pid +LoadModule mpm_prefork_module modules/mod_mpm_prefork.so +LoadModule unixd_module modules/mod_unixd.so +LoadModule dav_module modules/mod_dav.so +LoadModule dav_fs_module modules/mod_dav_fs.so +LoadModule dav_lock_module modules/mod_dav_lock.so Listen 7500 +ServerName localhost:7500 DocumentRoot $self->{docroot} @@ -61,12 +67,13 @@ Listen 7500 }; - exec $exe, "-F", "-f", $filename; + exec $exe, "-DNO_DETACH", "-DFOREGROUND", "-f", $filename; } sub DESTROY { my $self = shift; unlink $self->{temp_conf_file} if $self->{temp_conf_file}; + delete $self->{temp_pid_directory} if $self->{temp_pid_directory}; } 1; -- 1.8.1.4