summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Zend/ChangeLog4
-rw-r--r--ext/gd/tests/gif2gd.phpt2
-rw-r--r--ext/gd/tests/gif2jpg.phpt2
-rw-r--r--ext/gd/tests/gif2png.phpt2
-rw-r--r--ext/gd/tests/imagefilter.phpt2
-rw-r--r--ext/gd/tests/imagefttext.phpt2
-rw-r--r--ext/gd/tests/jpeg2png.phpt2
-rw-r--r--ext/gd/tests/jpg2gd.phpt2
-rw-r--r--ext/gd/tests/png2gd.phpt2
-rw-r--r--ext/gd/tests/xbm2png.phpt2
-rw-r--r--ext/gd/tests/xpm2gd.phpt2
-rw-r--r--ext/gd/tests/xpm2jpg.phpt2
-rw-r--r--ext/gd/tests/xpm2png.phpt2
-rw-r--r--ext/informix/ifx.ec2
-rw-r--r--ext/mbstring/tests/mb_send_mail05.phpt2
-rw-r--r--ext/mbstring/tests/mb_send_mail06.phpt2
-rw-r--r--ext/mbstring/tests/mb_send_mail07.phpt2
-rw-r--r--ext/mhash/tests/skip.inc2
-rw-r--r--ext/mime_magic/mime_magic.c2
-rw-r--r--ext/pcntl/tests/001.phpt2
-rw-r--r--ext/pspell/tests/01pspell_basic.phpt2
-rw-r--r--ext/shmop/tests/001.phpt2
-rw-r--r--ext/standard/tests/image/getimagesize_swc.phpt2
-rwxr-xr-xrun-tests.php4
-rw-r--r--sapi/apache2handler/sapi_apache2.c2
25 files changed, 27 insertions, 27 deletions
diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index aad5fccf8e..20598f9d18 100644
--- a/Zend/ChangeLog
+++ b/Zend/ChangeLog
@@ -6446,13 +6446,13 @@
2003-02-08 Ilia Alshanetsky <ilia@prohost.org>
* zend_builtin_functions.c:
- The string.h is already avaliable through zend.h, so the manual inclusion
+ The string.h is already available through zend.h, so the manual inclusion
is not necessary.
2003-02-07 Ilia Alshanetsky <ilia@prohost.org>
* zend_builtin_functions.c:
- Added a check to ensure that string.h is avaliable before trying to use it.
+ Added a check to ensure that string.h is available before trying to use it.
Thanks Andi.
diff --git a/ext/gd/tests/gif2gd.phpt b/ext/gd/tests/gif2gd.phpt
index 3eee211871..75291777d8 100644
--- a/ext/gd/tests/gif2gd.phpt
+++ b/ext/gd/tests/gif2gd.phpt
@@ -3,7 +3,7 @@ gif --> gd1/gd2 conversion test
--SKIPIF--
<?php
if (!extension_loaded('gd')) {
- die("skip gd extension not avaliable.");
+ die("skip gd extension not available.");
}
if (!GD_BUNDLED) {
die("skip external GD libraries always fail");
diff --git a/ext/gd/tests/gif2jpg.phpt b/ext/gd/tests/gif2jpg.phpt
index 38a0493ff9..efea3525cf 100644
--- a/ext/gd/tests/gif2jpg.phpt
+++ b/ext/gd/tests/gif2jpg.phpt
@@ -3,7 +3,7 @@ gif --> jpeg conversion test
--SKIPIF--
<?php
if (!extension_loaded('gd')) {
- die("skip gd extension not avaliable.");
+ die("skip gd extension not available.");
}
if (!GD_BUNDLED) {
die("skip external GD libraries always fail");
diff --git a/ext/gd/tests/gif2png.phpt b/ext/gd/tests/gif2png.phpt
index 70ddc37937..6ac99bb22f 100644
--- a/ext/gd/tests/gif2png.phpt
+++ b/ext/gd/tests/gif2png.phpt
@@ -3,7 +3,7 @@ gif --> png conversion test
--SKIPIF--
<?php
if (!extension_loaded('gd')) {
- die("skip gd extension not avaliable.");
+ die("skip gd extension not available.");
}
if (!GD_BUNDLED) {
die("skip external GD libraries always fail");
diff --git a/ext/gd/tests/imagefilter.phpt b/ext/gd/tests/imagefilter.phpt
index 57f5e5412f..9857b53a00 100644
--- a/ext/gd/tests/imagefilter.phpt
+++ b/ext/gd/tests/imagefilter.phpt
@@ -3,7 +3,7 @@ imagefilter() function test
--SKIPIF--
<?php
if (!extension_loaded('gd')) {
- die("skip gd extension not avaliable.");
+ die("skip gd extension not available.");
}
if (!GD_BUNDLED) {
die("skip this test requires bundled gd library.");
diff --git a/ext/gd/tests/imagefttext.phpt b/ext/gd/tests/imagefttext.phpt
index ca62d60d43..16e0495ef0 100644
--- a/ext/gd/tests/imagefttext.phpt
+++ b/ext/gd/tests/imagefttext.phpt
@@ -3,7 +3,7 @@ imagefttext() function test
--SKIPIF--
<?php
if (!extension_loaded('gd')) {
- die("skip gd extension not avaliable.");
+ die("skip gd extension not available.");
}
if (!function_exists("imagefttext")) {
die("skip imagefttext() not available.");
diff --git a/ext/gd/tests/jpeg2png.phpt b/ext/gd/tests/jpeg2png.phpt
index e345a51abd..c86cb4fe4a 100644
--- a/ext/gd/tests/jpeg2png.phpt
+++ b/ext/gd/tests/jpeg2png.phpt
@@ -3,7 +3,7 @@ jpeg <--> png conversion test
--SKIPIF--
<?php
if (!extension_loaded('gd')) {
- die("skip gd extension not avaliable.");
+ die("skip gd extension not available.");
}
if (!GD_BUNDLED) {
die("skip external GD libraries always fail");
diff --git a/ext/gd/tests/jpg2gd.phpt b/ext/gd/tests/jpg2gd.phpt
index c1da986f21..24d1940faf 100644
--- a/ext/gd/tests/jpg2gd.phpt
+++ b/ext/gd/tests/jpg2gd.phpt
@@ -3,7 +3,7 @@ jpeg <--> gd1/gd2 conversion test
--SKIPIF--
<?php
if (!extension_loaded('gd')) {
- die("skip gd extension not avaliable.");
+ die("skip gd extension not available.");
}
if (!GD_BUNDLED) {
die("skip external GD libraries always fail");
diff --git a/ext/gd/tests/png2gd.phpt b/ext/gd/tests/png2gd.phpt
index 9a25c5a7bc..d74e888d6c 100644
--- a/ext/gd/tests/png2gd.phpt
+++ b/ext/gd/tests/png2gd.phpt
@@ -3,7 +3,7 @@ png <--> gd1/gd2 conversion test
--SKIPIF--
<?php
if (!extension_loaded('gd')) {
- die("skip gd extension not avaliable.");
+ die("skip gd extension not available.");
}
if (!GD_BUNDLED) {
die("skip external GD libraries always fail");
diff --git a/ext/gd/tests/xbm2png.phpt b/ext/gd/tests/xbm2png.phpt
index 5c51226093..6edebc0b8d 100644
--- a/ext/gd/tests/xbm2png.phpt
+++ b/ext/gd/tests/xbm2png.phpt
@@ -3,7 +3,7 @@ xbm --> png conversion test
--SKIPIF--
<?php
if (!extension_loaded('gd')) {
- die("skip gd extension not avaliable.");
+ die("skip gd extension not available.");
}
if (!function_exists("imagepng")) {
die("skip png support unavailable");
diff --git a/ext/gd/tests/xpm2gd.phpt b/ext/gd/tests/xpm2gd.phpt
index 617d634e6a..9c6cca4eb9 100644
--- a/ext/gd/tests/xpm2gd.phpt
+++ b/ext/gd/tests/xpm2gd.phpt
@@ -3,7 +3,7 @@ xpm --> gd1/gd2 conversion test
--SKIPIF--
<?php
if (!extension_loaded('gd')) {
- die("skip gd extension not avaliable.");
+ die("skip gd extension not available.");
}
if (!GD_BUNDLED) {
die("skip external GD libraries always fail");
diff --git a/ext/gd/tests/xpm2jpg.phpt b/ext/gd/tests/xpm2jpg.phpt
index 462d42680a..3df491ce44 100644
--- a/ext/gd/tests/xpm2jpg.phpt
+++ b/ext/gd/tests/xpm2jpg.phpt
@@ -3,7 +3,7 @@ xpm --> jpeg conversion test
--SKIPIF--
<?php
if (!extension_loaded('gd')) {
- die("skip gd extension not avaliable.");
+ die("skip gd extension not available.");
}
if (!GD_BUNDLED) {
die("skip external GD libraries always fail");
diff --git a/ext/gd/tests/xpm2png.phpt b/ext/gd/tests/xpm2png.phpt
index ff8d403333..520cc3da0a 100644
--- a/ext/gd/tests/xpm2png.phpt
+++ b/ext/gd/tests/xpm2png.phpt
@@ -3,7 +3,7 @@ xpm --> png conversion test
--SKIPIF--
<?php
if (!extension_loaded('gd')) {
- die("skip gd extension not avaliable.");
+ die("skip gd extension not available.");
}
if (!GD_BUNDLED) {
die("skip external GD libraries always fail");
diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec
index f43a697d0b..850a70cf5f 100644
--- a/ext/informix/ifx.ec
+++ b/ext/informix/ifx.ec
@@ -497,7 +497,7 @@ EXEC SQL END DECLARE SECTION;
int host_len = 0, user_len = 0, passwd_len = 0;
host = user = passwd = NULL;
- /* set default values if any are avaliable */
+ /* set default values if any are available */
if (IFXG(default_host)) {
host = IFXG(default_host);
host_len = strlen(host);
diff --git a/ext/mbstring/tests/mb_send_mail05.phpt b/ext/mbstring/tests/mb_send_mail05.phpt
index 7d1dc981d2..7033424b80 100644
--- a/ext/mbstring/tests/mb_send_mail05.phpt
+++ b/ext/mbstring/tests/mb_send_mail05.phpt
@@ -6,7 +6,7 @@ if (@mb_send_mail() === false || !mb_language("Simplified Chinese")) {
die("skip mb_send_mail() not available");
}
if (!@mb_internal_encoding('GB2312')) {
- die("skip GB2312 encoding is not avaliable on this platform");
+ die("skip GB2312 encoding is not available on this platform");
}
?>
--INI--
diff --git a/ext/mbstring/tests/mb_send_mail06.phpt b/ext/mbstring/tests/mb_send_mail06.phpt
index 92087f9649..2e8c151284 100644
--- a/ext/mbstring/tests/mb_send_mail06.phpt
+++ b/ext/mbstring/tests/mb_send_mail06.phpt
@@ -6,7 +6,7 @@ if (@mb_send_mail() === false || !mb_language("Traditional Chinese")) {
die("skip mb_send_mail() not available");
}
if (!@mb_internal_encoding('BIG5')) {
- die("skip BIG5 encoding is not avaliable on this platform");
+ die("skip BIG5 encoding is not available on this platform");
}
?>
--INI--
diff --git a/ext/mbstring/tests/mb_send_mail07.phpt b/ext/mbstring/tests/mb_send_mail07.phpt
index ae429f3ced..21fdaa597c 100644
--- a/ext/mbstring/tests/mb_send_mail07.phpt
+++ b/ext/mbstring/tests/mb_send_mail07.phpt
@@ -6,7 +6,7 @@ if (@mb_send_mail() === false || !mb_language("Korean")) {
die("skip mb_send_mail() not available");
}
if (!@mb_internal_encoding('ISO-2022-KR')) {
- die("skip ISO-2022-KR encoding is not avaliable on this platform");
+ die("skip ISO-2022-KR encoding is not available on this platform");
}
?>
--INI--
diff --git a/ext/mhash/tests/skip.inc b/ext/mhash/tests/skip.inc
index 81912d21c8..ff60bfff27 100644
--- a/ext/mhash/tests/skip.inc
+++ b/ext/mhash/tests/skip.inc
@@ -1,5 +1,5 @@
<?php
if (!extension_loaded("mhash")) {
- die("skip mhash extension is not avaliable");
+ die("skip mhash extension is not available");
}
?> \ No newline at end of file
diff --git a/ext/mime_magic/mime_magic.c b/ext/mime_magic/mime_magic.c
index d4df213f72..c152ff1b36 100644
--- a/ext/mime_magic/mime_magic.c
+++ b/ext/mime_magic/mime_magic.c
@@ -350,7 +350,7 @@ PHP_FUNCTION(mime_content_type)
if (conf->magic == (struct magic *)-1) {
if(MIME_MAGIC_G(debug))
- php_error_docref("http://www.php.net/mime_magic" TSRMLS_CC, E_ERROR, "mime_magic could not be initialized, magic file %s is not avaliable", conf->magicfile);
+ php_error_docref("http://www.php.net/mime_magic" TSRMLS_CC, E_ERROR, "mime_magic could not be initialized, magic file %s is not available", conf->magicfile);
RETURN_FALSE;
}
diff --git a/ext/pcntl/tests/001.phpt b/ext/pcntl/tests/001.phpt
index 0c8e77ec6c..74c529124b 100644
--- a/ext/pcntl/tests/001.phpt
+++ b/ext/pcntl/tests/001.phpt
@@ -3,7 +3,7 @@ Test pcntl wait functionality
--SKIPIF--
<?php
if (!extension_loaded("pcntl")) print "skip";
- if (!function_exists("posix_kill")) print "skip posix_kill() not avaliable";
+ if (!function_exists("posix_kill")) print "skip posix_kill() not available";
?>
--FILE--
<?php
diff --git a/ext/pspell/tests/01pspell_basic.phpt b/ext/pspell/tests/01pspell_basic.phpt
index 107690e088..37676d087e 100644
--- a/ext/pspell/tests/01pspell_basic.phpt
+++ b/ext/pspell/tests/01pspell_basic.phpt
@@ -4,7 +4,7 @@ pspell basic tests (warning: may fail with pspell/aspell < GNU Aspell 0.50.3)
<?php
if (!extension_loaded("pspell")) print "skip";
if (!@pspell_new ("en", "", "", "", (PSPELL_FAST|PSPELL_RUN_TOGETHER))) {
- die("skip English dictionary is not avaliable");
+ die("skip English dictionary is not available");
}
?>
--FILE--
diff --git a/ext/shmop/tests/001.phpt b/ext/shmop/tests/001.phpt
index 1a1b926308..fc293c82ec 100644
--- a/ext/shmop/tests/001.phpt
+++ b/ext/shmop/tests/001.phpt
@@ -3,7 +3,7 @@ shmop extension test
--SKIPIF--
<?php
if (!extension_loaded("shmop")) {
- die("skip shmop() extension not avaliable");
+ die("skip shmop() extension not available");
}
?>
--FILE--
diff --git a/ext/standard/tests/image/getimagesize_swc.phpt b/ext/standard/tests/image/getimagesize_swc.phpt
index b9b83f4373..f8c74498a4 100644
--- a/ext/standard/tests/image/getimagesize_swc.phpt
+++ b/ext/standard/tests/image/getimagesize_swc.phpt
@@ -3,7 +3,7 @@ GetImageSize() for compressed swf files
--SKIPIF--
<?php
if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
- die("skip zlib extension is not avaliable");
+ die("skip zlib extension is not available");
}
?>
--FILE--
diff --git a/run-tests.php b/run-tests.php
index d6cfdca356..488e135261 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -37,7 +37,7 @@
*/
-/* Sanity check to ensure that pcre extension needed by this script is avaliable.
+/* Sanity check to ensure that pcre extension needed by this script is available.
* In the event it is not, print a nice error message indicating that this script will
* not run without it.
*/
@@ -699,7 +699,7 @@ TEST $file
}
fclose($fp);
- /* For GET/POST tests, check if cgi sapi is avaliable and if it is, use it. */
+ /* For GET/POST tests, check if cgi sapi is available and if it is, use it. */
if ((!empty($section_text['GET']) || !empty($section_text['POST']))) {
if (file_exists("./sapi/cgi/php")) {
$old_php = $php;
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 43ef44c1fc..fa91288f95 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -142,7 +142,7 @@ php_apache_sapi_read_post(char *buf, uint count_bytes TSRMLS_DC)
/*
* This loop is needed because ap_get_brigade() can return us partial data
* which would cause premature termination of request read. Therefor we
- * need to make sure that if data is avaliable we fill the buffer completely.
+ * need to make sure that if data is available we fill the buffer completely.
*/
while (ap_get_brigade(r->input_filters, brigade, AP_MODE_READBYTES, APR_BLOCK_READ, len) == APR_SUCCESS) {