diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-11-29 01:45:54 +0000 |
| commit | 01554bf3e417f13baf7af874e449c265c0309279 (patch) | |
| tree | 8aca46ab27a54cea34c14001af774942f0502e39 /scripts/apache | |
| parent | 65c8edd525108f6598a8bb25fb3c5d6c80233322 (diff) | |
| parent | 719083bd943e6c287c2dcb47918cf51f89a4ac08 (diff) | |
| download | php-git-01554bf3e417f13baf7af874e449c265c0309279.tar.gz | |
Merge branch 'master' into zppFailOnOverflow
Diffstat (limited to 'scripts/apache')
| -rwxr-xr-x | scripts/apache/apconf-conv.sh | 24 | ||||
| -rwxr-xr-x | scripts/apache/aphtaccess-conv.sh | 24 | ||||
| -rw-r--r-- | scripts/apache/conffix.awk | 23 | ||||
| -rw-r--r-- | scripts/apache/htaccessfix.awk | 23 |
4 files changed, 0 insertions, 94 deletions
diff --git a/scripts/apache/apconf-conv.sh b/scripts/apache/apconf-conv.sh deleted file mode 100755 index 6126bdc27d..0000000000 --- a/scripts/apache/apconf-conv.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -if [ "$1" = "" ]; then - echo "Usage: $0 /somewhere/httpd.conf" - exit 1 -fi - -if [ ! -w $1 ]; then - echo "You cannot write to $1" - exit 1 -fi - -TMPFILE=tmpfile.$$ - -awk -f conffix.awk <$1 >$TMPFILE - -if [ "$?" != 0 ]; then - exit 1 -fi - -mv -f $1 $1.orig -mv -f $TMPFILE $1 -exit 0 - diff --git a/scripts/apache/aphtaccess-conv.sh b/scripts/apache/aphtaccess-conv.sh deleted file mode 100755 index 1af59d2843..0000000000 --- a/scripts/apache/aphtaccess-conv.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -if [ "$1" = "" ]; then - echo "Usage: $0 /somewhere/.htaccess" - exit 1 -fi - -if [ ! -w $1 ]; then - echo "You cannot write to $1" - exit 1 -fi - -TMPFILE=tmpfile.$$ - -awk -f htaccessfix.awk <$1 >$TMPFILE - -if [ "$?" != 0 ]; then - exit 1 -fi - -mv -f $1 $1.orig -mv -f $TMPFILE $1 -exit 0 - diff --git a/scripts/apache/conffix.awk b/scripts/apache/conffix.awk deleted file mode 100644 index 88be6fade7..0000000000 --- a/scripts/apache/conffix.awk +++ /dev/null @@ -1,23 +0,0 @@ -# $Id$ - -/^[ \t]*php3_*/ { - phpcommand=substr($1,6) - phpvalue=tolower($2) - print "<IfModule mod_php3.c>" - print $0 - print "</IfModule>" - print "<IfModule mod_php4.c>" - if (phpvalue=="on") { - print "php_admin_flag " phpcommand " on" - } else if (phpvalue=="off") { - print "php_admin_flag " phpcommand " off" - } else { - print "php_admin_value " phpcommand " " substr($0,index($0,$1)+length($1)+1) - } - print "</IfModule>" -} - -! /^[ \t]*php3_*/ { - print $0 -} - diff --git a/scripts/apache/htaccessfix.awk b/scripts/apache/htaccessfix.awk deleted file mode 100644 index 3c784cd335..0000000000 --- a/scripts/apache/htaccessfix.awk +++ /dev/null @@ -1,23 +0,0 @@ -# $Id$ - -/^[ \t]*php3_*/ { - phpcommand=substr($1,6) - phpvalue=tolower($2) - print "<IfModule mod_php3.c>" - print $0 - print "</IfModule>" - print "<IfModule mod_php4.c>" - if (phpvalue=="on") { - print "php_flag " phpcommand " on" - } else if (phpvalue=="off") { - print "php_flag " phpcommand " off" - } else { - print "php_value " phpcommand " " substr($0,index($0,$1)+length($1)+1) - } - print "</IfModule>" -} - -! /^[ \t]*php3_*/ { - print $0 -} - |