From 1d299ecd001fabafcb70947644e554bf71617a55 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Tue, 18 Aug 2015 20:58:00 -0700
Subject: [PATCH] Port special case for Debian apache2 package to Webmin

---
 package-updates/package-updates-lib.pl | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/package-updates/package-updates-lib.pl b/package-updates/package-updates-lib.pl
index e7c8dab1b..99b5615ce 100644
--- a/package-updates/package-updates-lib.pl
+++ b/package-updates/package-updates-lib.pl
@@ -319,6 +319,18 @@ if (defined(&software::update_system_install)) {
 	&clean_environment();
 	if ($software::update_system eq $pkg->{'system'}) {
 		# Can use the default system
+		if ($name eq "apache2" &&
+		    $pkg->{'system'} eq 'apt') {
+			# If updating the apache2 package on an apt system
+			# and apache2-mpm-prefork is installed, also update it
+			# so that ubuntu doesn't pull in the apache2-mpm-worker
+			# instead, which breaks PHP :-(
+			local @pinfo = &software::package_info(
+					"apache2-mpm-prefork");
+			if (@pinfo) {
+				$name .= " apache2-mpm-prefork";
+				}
+			}
 		@rv = &software::update_system_install($name, undef, 1);
 		}
 	else {