- MFH: Fix typo (avaliable -> available). (bug #28725)

diff --git a/Zend/ChangeLog b/Zend/ChangeLog
index aad5fccf8effa580ee8970add369e8e706191a20..20598f9d185e9bd8fea98e87b01d7ea4c37c61f1 100644 (file)
--- 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 3eee211871c74c503a9872fd2ee51fab4619b5ac..75291777d8b50c0d547d2b2cc9f17e62122bd1ae 100644 (file)
--- 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 38a0493ff9f889656133a58714ea21cc429b1fc4..efea3525cfe9b675da2da0c6a1ac0132b0a3d0a7 100644 (file)
--- 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 70ddc379376409be37b0673639d486be14aa43ff..6ac99bb22fa4675df9ca3f8ea51740b1740f5ced 100644 (file)
--- 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 57f5e5412f1bb1e1480fa37b45dfe4dd3fa46c93..9857b53a00789f61886b0654febf90a576ab9c28 100644 (file)
--- 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 ca62d60d431c1bd339248569186718f8ff107a2e..16e0495ef034d12bda4eab9db73c630b9651a115 100644 (file)
--- 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 e345a51abd90018d82930b3b195a38d4c9097b27..c86cb4fe4a8a247d18941548e871a3b09518bb36 100644 (file)
--- 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 c1da986f211d88e835ec3bf6d80a5a2f4fd725d2..24d1940faf3c0cb6c80db1d9cec595b8550d1fe9 100644 (file)
--- 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 9a25c5a7bc59c30fe5e845f814dfafac4cc64c68..d74e888d6c1566b2104ea298dfb0f5233d1fe694 100644 (file)
--- 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 5c512260939aa2e846438a5b7663c26fe440ed08..6edebc0b8d563d35a6b1ec86f260aefd6386b42d 100644 (file)
--- 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 617d634e6aa4decae8cdd6e66608235ae96fadf8..9c6cca4eb9ad83ad11b1fa7d2e8b70f84e56ff1d 100644 (file)
--- 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 462d42680a4e8f5b176b82979d2e6bf829ceb4b1..3df491ce44effacda8d1217a2e6c8e00059edf8b 100644 (file)
--- 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 ff8d403333d70c0eccbddb4268e62aa1fc2f516f..520cc3da0a74d8d28ab3902fef5555327856b215 100644 (file)
--- 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 f43a697d0bcae2768003477d88ba68a94bc332b4..850a70cf5f02c9429f14ee6fd1423612934d2ed4 100644 (file)
--- 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 7d1dc981d2abd058e11d7d441df3d0d739c1566a..7033424b80e7b1b6ccabbea6b356ebca64d1756a 100644 (file)
--- 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 92087f96490797754289bd10abfa04466b0cf2b1..2e8c1512848402772d774962c7245777cbd2d226 100644 (file)
--- 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 ae429f3ced52a350fa6eb251d604e62d7a2cf9ee..21fdaa597c5afa7e466a30b990f9bddba735c25e 100644 (file)
--- 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 81912d21c84b40f57666e2e90f3cb1e691d45eae..ff60bfff275bcdd42f56007f0577cb057f3b1476 100644 (file)
--- 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 d4df213f72552a92c99c4d72bd7f8f08ab6c0736..c152ff1b36101ac91bca5fd4b378e8a8e74d6d5a 100644 (file)
--- 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 0c8e77ec6c0be3aeceb1dcb5e5c92a21c86e9803..74c529124bf712ea675b90e0ef0c00201e41ef0c 100644 (file)
--- 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 107690e08808edd31d65db1636ebcd1be8b29095..37676d087e8786a4720a3c1f8addba9bac88c25c 100644 (file)
--- 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 1a1b926308d05bd423773537be2c8923c4815dde..fc293c82ec8367ebc48594fc61397a2862ee88cf 100644 (file)
--- 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 b9b83f437372f298d6160fce1a1bbb7a8f960395..f8c74498a43c9a671f757094f18743baa96fa5f2 100644 (file)
--- 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 d6cfdca3561f026fffc93857a06f0b9c778a6616..488e135261894ba17195d6d628b0a92768a9fa2c 100755 (executable)
--- 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 43ef44c1fcbe8d9eb190fce26bd13462b8e17c1d..fa91288f95289c839e30328e5829ce397ca9c0e7 100644 (file)
--- 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) {