diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index f550a1f22fb..733b06bd069 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1464,7 +1464,8 @@ static int php_array_walk(pval **a)
 	return 0;
 }
 
-PHP_FUNCTION(array_walk) {
+PHP_FUNCTION(array_walk)
+{
 	pval *array, *old_walk_func_name;
 	HashTable *target_hash;
 
diff --git a/scripts/apache/conffix.awk b/scripts/apache/conffix.awk
index c4aa28f0150..88be6fade70 100644
--- a/scripts/apache/conffix.awk
+++ b/scripts/apache/conffix.awk
@@ -1,10 +1,10 @@
 # $Id$
 
-/php3_*/ {
+/^[ \t]*php3_*/ {
 	phpcommand=substr($1,6)
 	phpvalue=tolower($2)
 	print "<IfModule mod_php3.c>"
-	print $1 $2
+	print $0
 	print "</IfModule>"
 	print "<IfModule mod_php4.c>"
 	if (phpvalue=="on") {
@@ -17,7 +17,7 @@
 	print "</IfModule>"
 }
 
-! /php3_*/ {
+! /^[ \t]*php3_*/ {
 	print $0
 }
 
diff --git a/scripts/apache/htaccessfix.awk b/scripts/apache/htaccessfix.awk
index a74e2bbfd8e..3c784cd3359 100644
--- a/scripts/apache/htaccessfix.awk
+++ b/scripts/apache/htaccessfix.awk
@@ -1,10 +1,10 @@
 # $Id$
 
-/php3_*/ {
+/^[ \t]*php3_*/ {
 	phpcommand=substr($1,6)
 	phpvalue=tolower($2)
 	print "<IfModule mod_php3.c>"
-	print $1 $2
+	print $0
 	print "</IfModule>"
 	print "<IfModule mod_php4.c>"
 	if (phpvalue=="on") {
@@ -17,7 +17,7 @@
 	print "</IfModule>"
 }
 
-! /php3_*/ {
+! /^[ \t]*php3_*/ {
 	print $0
 }