summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2004-12-16 12:36:49 +0000
committerfoobar <sniper@php.net>2004-12-16 12:36:49 +0000
commitefbaf4327a233b63582c52f46d4b24e539ffecc0 (patch)
treee5b50dbdbcbb883f76a8eaa2e895d65a76e9ab92
parent39413a6022387dc55b43a66878d8390d608a1ec9 (diff)
downloadphp-git-efbaf4327a233b63582c52f46d4b24e539ffecc0.tar.gz
MFH: Fix typo (avaliable -> available). (bug #28725)
-rw-r--r--ChangeLog20
-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/jpeg2png.phpt2
-rw-r--r--ext/gd/tests/jpg2gd.phpt2
-rw-r--r--ext/gd/tests/png2gd.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-xpear/CMD.php2
-rwxr-xr-xrun-tests.php4
-rw-r--r--sapi/apache2handler/sapi_apache2.c2
-rw-r--r--tests/lang/overload_leak.phpt2
24 files changed, 34 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index f9cf05f815..a1a23645c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -148,9 +148,9 @@
* Changed all argument parsing to use the new zend_parse_parameters()
* If a function is unavailable due to lack of support for a certain
feature,
- do not make the function avaliable, rather then making it print an
+ do not make the function available, rather then making it print an
error
- saying that the functionality offered by the function is not avaliable.
+ saying that the functionality offered by the function is not available.
* Lots of WS fixes all over the file.
* Change strcpy() to strncpy() to prevent possible buffer overflows.
Fixed a bug in ncurses_pair_content(), 1st parameter was wrong.
@@ -1384,7 +1384,7 @@
2002-12-11 Ilia Alshanetsky <ilia@prohost.org>
* ext/exif/exif.c:
- decode variable is only used when mbstring is avaliable.
+ decode variable is only used when mbstring is available.
* ext/openssl/openssl.c:
ZTS fix.
@@ -2193,7 +2193,7 @@
2002-12-04 Ilia Alshanetsky <ilia@prohost.org>
* ext/gd/gd.c:
- MFH (build fix, when xpm support is not avaliable).
+ MFH (build fix, when xpm support is not available).
2002-12-04 Rasmus Lerdorf <rasmus@lerdorf.on.ca>
@@ -5864,7 +5864,7 @@
Compile warning fix.
* ext/mbstring/tests/overload.phpt:
- Added a skip condition for when mail() function is not avaliable.
+ Added a skip condition for when mail() function is not available.
* ext/mbstring/tests/mb_send_mail05.phpt
ext/mbstring/tests/mb_send_mail06.phpt:
@@ -6758,7 +6758,7 @@
ext/standard/tests/strings/htmlentities07.phpt
ext/standard/tests/strings/htmlentities08.phpt
ext/standard/tests/strings/htmlentities09.phpt:
- Added skip conditions in the event the required charset is not avaliabled.
+ Added skip conditions in the event the required charset is not availabled.
Removed old (commented out) module loading code.
* run-tests.php:
@@ -6766,11 +6766,11 @@
* ext/pspell/tests/01pspell_basic.phpt:
Added a skip condition if the English dictionary needed for the test is not
- avaliable.
+ available.
* ext/pcntl/tests/001.phpt:
Added a skip condition in the event posix_kill(), which is used by the test
- is not avaliable.
+ is not available.
* ext/exif/exif.c:
@@ -6903,7 +6903,7 @@
main/safe_mode.c:
Instead of checking whether realpath exists based on OS. Use the
- HAVE_REALPATH define, which is set if realpath() is avaliable. This patch
+ HAVE_REALPATH define, which is set if realpath() is available. This patch
also resolves bug #18868.
2002-11-06 Sascha Schumann <sascha@schumann.cx>
@@ -9030,7 +9030,7 @@
* ext/standard/tests/strings/strtoupper.phpt:
Added 'skip logic' to the test on platforms where the locale required by
- this test is not avaliable.
+ this test is not available.
2002-10-23 Melvyn Sopacua <msopacua@idg.nl>
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/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/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 5cbb91738b..2be8fbb815 100644
--- a/ext/informix/ifx.ec
+++ b/ext/informix/ifx.ec
@@ -498,7 +498,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 029e37d723..3be2262f57 100644
--- a/ext/mime_magic/mime_magic.c
+++ b/ext/mime_magic/mime_magic.c
@@ -314,7 +314,7 @@ PHP_FUNCTION(mime_content_type)
}
if (conf->magic == (struct magic *)-1) {
- php_error(E_ERROR, MODNAME " could not be initialized, magic file %s is not avaliable", conf->magicfile);
+ php_error(E_ERROR, MODNAME " 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 27aff8bbe4..642525976a 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";
?>
--POST--
--GET--
diff --git a/ext/pspell/tests/01pspell_basic.phpt b/ext/pspell/tests/01pspell_basic.phpt
index 5a25e35be8..fd97bcf62d 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");
}
?>
--POST--
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/pear/CMD.php b/pear/CMD.php
index 7e82ff24b5..2bf82def35 100755
--- a/pear/CMD.php
+++ b/pear/CMD.php
@@ -231,7 +231,7 @@ class Cmd extends PEAR
/**
* Errorhandler. If option CMD_VERBOSE is true,
* the error is printed to stdout, otherwise it
- * is avaliable in lastError
+ * is available in lastError
*
* @return bool always returns true
*
diff --git a/run-tests.php b/run-tests.php
index ca608c3a76..0cac9cfa09 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.
*/
@@ -568,7 +568,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 62f476f35d..cc4390bf12 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -140,7 +140,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) {
diff --git a/tests/lang/overload_leak.phpt b/tests/lang/overload_leak.phpt
index 4772ddec8a..2385e46973 100644
--- a/tests/lang/overload_leak.phpt
+++ b/tests/lang/overload_leak.phpt
@@ -2,7 +2,7 @@
Memory leaks occur within an overloaded method that returns a reference
--SKIPIF--
<?php
- if (!function_exists('overload')) die('SKIP overload() not avaliable');
+ if (!function_exists('overload')) die('SKIP overload() not available');
?>
--FILE--
<?php