[Pkg-apache-commits] r1120 - in /trunk/apache2: apache2.2-common.bug-script changelog

[sf at alioth.debian.org]

Author: sf
Date: Sat Jan 16 23:22:50 2010
New Revision: 1120

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1120
Log:
Make bug script also display loaded php extensions

Modified:
    trunk/apache2/apache2.2-common.bug-script
    trunk/apache2/changelog

Modified: trunk/apache2/apache2.2-common.bug-script
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.bug-script?rev=1120&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.bug-script (original)
+++ trunk/apache2/apache2.2-common.bug-script Sat Jan 16 23:22:50 2010
@@ -9,6 +9,7 @@
 my $apache = ". /etc/apache2/envvars && /usr/sbin/apache2";
 my $res = `$apache -t 2>&1`;
 my @modules;
+my $php;
 if ($res !~ "Syntax OK") {
 	# if we are not root, syntax check will fail because ssl private keys
 	# are not readable
@@ -33,6 +34,9 @@
 			$m .= "*";
 			$missing = 1;
 		}
+		if ($m =~ /^(php\d)/) {
+			$php = $1;
+		}
 	}
 
 	print $out wrap("  ", "  ", "@modules\n");
@@ -43,3 +47,14 @@
 		"enabled in /etc/apache2/mods-enabled/)\n") 
 	    if $missing;
 }
+if (defined $php) {
+	my @exts = qx{egrep ^extension= /etc/$php/apache2/php.ini /etc/$php/apache2/conf.d/* 2>/dev/null};
+	if (scalar @exts) {
+		chomp @exts;
+		@exts = grep { ! m{\.dpkg-(?:bak|dist):} } @exts;
+		@exts = sort grep { s{^.*:extension=(\S+)\.\S+}{$1} } @exts;
+		print $out "List of enabled $php extensions:\n";
+		print $out wrap("  ", "  ", "@exts\n");
+	}
+}
+

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1120&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sat Jan 16 23:22:50 2010
@@ -2,6 +2,7 @@
 
   * Move ab and logresolve from /usr/sbin to /usr/bin. Closes: #351450, #564061
   * Add new init script action graceful-stop (LP: #456381)
+  * Make bug script also display php extensions.
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 09 Jan 2010 13:11:11 +0100