diff options
| author | Zeev Suraski <zeev@php.net> | 1999-08-07 15:31:57 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-08-07 15:31:57 +0000 |
| commit | 125300b56328d1c56c61efa72f53499c1a586e3e (patch) | |
| tree | 97bc364ccbb34ea382b9fd1ca7011d5f75665289 | |
| parent | 04876505361e394bc1153e7dc392bd0972347a9f (diff) | |
| download | php-git-125300b56328d1c56c61efa72f53499c1a586e3e.tar.gz | |
Fix&improve conversion scripts
| -rw-r--r-- | ext/standard/basic_functions.c | 3 | ||||
| -rw-r--r-- | scripts/apache/conffix.awk | 6 | ||||
| -rw-r--r-- | scripts/apache/htaccessfix.awk | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index f550a1f22f..733b06bd06 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 c4aa28f015..88be6fade7 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 a74e2bbfd8..3c784cd335 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 } |