test/stub/apache2/httpd.conf.erb in passenger-3.0.11 vs test/stub/apache2/httpd.conf.erb in passenger-3.0.12

@@ -27,10 +27,14 @@
 	LoadModule rewrite_module "<%= modules_dir %>/mod_rewrite.so"
 <% end %>
 <% if !has_builtin_module?('mod_env.c') %>
 	LoadModule env_module "<%= modules_dir %>/mod_env.so"
 <% end %>
+<% if PlatformInfo.httpd_version >= '2.4.0' %>
+	LoadModule authz_core_module "<%= modules_dir %>/mod_authz_core.so"
+	LoadModule unixd_module "<%= modules_dir %>/mod_unixd.so"
+<% end %>
 LoadModule passenger_module "<%= @mod_passenger %>"
 
 PassengerRoot "<%= @passenger_root %>"
 PassengerRuby "<%= PlatformInfo.ruby_command %>"
 PassengerDefaultUser <%= CONFIG['default_user'] %>
@@ -55,24 +59,31 @@
 <IfModule mpm_worker_module>
 	MinSpareThreads       1
 	MaxSpareThreads       1
 	ThreadsPerChild       2
 </IfModule>
+<IfModule mpm_event_module>
+	MinSpareThreads       1
+	MaxSpareThreads       1
+	ThreadsPerChild       2
+</IfModule>
 
 <Directory />
 	AllowOverride all
 </Directory>
 
 ServerAdmin [e-mail]
 ServerName passenger.test
 DocumentRoot "<%= @server_root %>"
 
-LockFile  <%= @server_root %>/httpd.lock
+<% if PlatformInfo.httpd_version < '2.4.0' %>
+	LockFile  <%= @server_root %>/httpd.lock
+<% end %>
 PidFile   <%= @server_root %>/httpd.pid
 ErrorLog  <%= @passenger_root %>/test/test.log
 CustomLog <%= @server_root %>/access.log combined
 
-<% if !vhosts.empty? %>
+<% if !vhosts.empty? && PlatformInfo.httpd_version < '2.4.0' %>
 	NameVirtualHost *:<%= @port %>
 <% end %>
 <% for vhost in vhosts %>
 	<VirtualHost *:<%= @port %>>
 		ServerName <%= vhost.domain %>