summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorVeres Lajos <vlajos@gmail.com>2013-07-24 00:55:43 +0100
committerStanislav Malyshev <stas@php.net>2013-08-04 16:05:36 -0700
commit8d86597d7368460383a33a4399ea7a8b244cd6fa (patch)
tree39778cd6a7c61ad3a00f5ce0f11a59de60836ba2 /sapi
parent5f137d080acfc43ec66cc2a904076972edb5de67 (diff)
downloadphp-git-8d86597d7368460383a33a4399ea7a8b244cd6fa.tar.gz
non living code related typo fixes
Diffstat (limited to 'sapi')
-rw-r--r--sapi/apache/config.m42
-rw-r--r--sapi/apache2filter/config.m42
-rw-r--r--sapi/apache2handler/config.m42
-rw-r--r--sapi/apache_hooks/config.m42
-rw-r--r--sapi/fpm/php-fpm.conf.in2
5 files changed, 5 insertions, 5 deletions
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index af83e9bcfa..1961289de0 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -59,7 +59,7 @@ if test "$PHP_APXS" != "no"; then
# Test that we're trying to configure with apache 1.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
if test "$APACHE_VERSION" -ge 2000000; then
- AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2])
+ AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropriate switch --with-apxs2])
fi
for flag in $APXS_CFLAGS; do
diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index c49488d182..b6524fd874 100644
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -62,7 +62,7 @@ if test "$PHP_APXS2FILTER" != "no"; then
# Test that we're trying to configure with apache 2.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
if test "$APACHE_VERSION" -le 2000000; then
- AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)])
+ AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)])
elif test "$APACHE_VERSION" -lt 2000040; then
AC_MSG_ERROR([Please note that Apache version >= 2.0.40 is required])
fi
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index 702f91f5d2..753de10ba8 100644
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -61,7 +61,7 @@ if test "$PHP_APXS2" != "no"; then
# Test that we're trying to configure with apache 2.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
if test "$APACHE_VERSION" -le 2000000; then
- AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropiate switch --with-apxs (without the 2)])
+ AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3. Please use the appropriate switch --with-apxs (without the 2)])
elif test "$APACHE_VERSION" -lt 2000044; then
AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
fi
diff --git a/sapi/apache_hooks/config.m4 b/sapi/apache_hooks/config.m4
index 4213b7c6a6..672f298084 100644
--- a/sapi/apache_hooks/config.m4
+++ b/sapi/apache_hooks/config.m4
@@ -60,7 +60,7 @@ if test "$PHP_APACHE_HOOKS" != "no"; then
# Test that we're trying to configure with apache 1.x
PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
if test "$APACHE_VERSION" -ge 2000000; then
- AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropiate switch --with-apxs2])
+ AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2. Please use the appropriate switch --with-apxs2])
fi
for flag in $APXS_CFLAGS; do
diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in
index 6912477b85..af4f2fa325 100644
--- a/sapi/fpm/php-fpm.conf.in
+++ b/sapi/fpm/php-fpm.conf.in
@@ -401,7 +401,7 @@ pm.max_spare_servers = 3
; - %{megabytes}M
; - %{mega}M
; %n: pool name
-; %o: ouput header
+; %o: output header
; it must be associated with embraces to specify the name of the header:
; - %{Content-Type}o
; - %{X-Powered-By}o