cvs: /php4/ext/standard basic_functions.c /php4/scripts/apache conffix.awk htaccessfix.awk

zeev Sat Aug 7 11:31:58 1999 EDT Modified files: /php4/ext/standard basic_functions.c /php4/scripts/apache conffix.awk htaccessfix.awk Log: Fix&improve conversion scripts Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.68 php4/ext/standard/basic_functions.c:1.69 --- php4/ext/standard/basic_functions.c:1.68 Fri Aug 6 11:34:51 1999 +++ php4/ext/standard/basic_functions.c Sat Aug 7 11:31:57 1999 @@ -1464,7 +1464,8 @@ return 0; } -PHP_FUNCTION(array_walk) { +PHP_FUNCTION(array_walk) +{ pval *array, *old_walk_func_name; HashTable *target_hash; Index: php4/scripts/apache/conffix.awk diff -u php4/scripts/apache/conffix.awk:1.1 php4/scripts/apache/conffix.awk:1.2 --- php4/scripts/apache/conffix.awk:1.1 Thu Jul 15 14:33:41 1999 +++ php4/scripts/apache/conffix.awk Sat Aug 7 11:31:57 1999 @@ -1,10 +1,10 @@ -# $Id: conffix.awk,v 1.1 1999/07/15 18:33:41 andi Exp $ +# $Id: conffix.awk,v 1.2 1999/08/07 15:31:57 zeev Exp $ -/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 } Index: php4/scripts/apache/htaccessfix.awk diff -u php4/scripts/apache/htaccessfix.awk:1.1 php4/scripts/apache/htaccessfix.awk:1.2 --- php4/scripts/apache/htaccessfix.awk:1.1 Thu Jul 15 14:33:41 1999 +++ php4/scripts/apache/htaccessfix.awk Sat Aug 7 11:31:57 1999 @@ -1,10 +1,10 @@ -# $Id: htaccessfix.awk,v 1.1 1999/07/15 18:33:41 andi Exp $ +# $Id: htaccessfix.awk,v 1.2 1999/08/07 15:31:57 zeev Exp $ -/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 }