sniper Thu Dec 16 07:36:45 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src ChangeLog run-tests.php
/php-src/ext/gd/tests gif2gd.phpt gif2jpg.phpt gif2png.phpt
jpeg2png.phpt jpg2gd.phpt png2gd.phpt
xpm2gd.phpt xpm2jpg.phpt xpm2png.phpt
/php-src/ext/informix ifx.ec
/php-src/ext/mbstring/tests mb_send_mail05.phpt mb_send_mail06.phpt
mb_send_mail07.phpt
/php-src/ext/mhash/tests skip.inc
/php-src/ext/mime_magic mime_magic.c
/php-src/ext/pcntl/tests 001.phpt
/php-src/ext/pspell/tests 01pspell_basic.phpt
/php-src/ext/shmop/tests 001.phpt
/php-src/ext/standard/tests/image getimagesize_swc.phpt
/php-src/pear CMD.php
/php-src/sapi/apache2handler sapi_apache2.c
/php-src/tests/lang overload_leak.phpt
Log:
MFH: Fix typo (avaliable -> available). (bug #28725)
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1211.2.1&r2=1.1211.2.2&ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.1211.2.1 php-src/ChangeLog:1.1211.2.2
--- php-src/ChangeLog:1.1211.2.1 Thu Dec 26 23:00:09 2002
+++ php-src/ChangeLog Thu Dec 16 07:36:32 2004
@@ -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 <[EMAIL PROTECTED]>
* 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 <[EMAIL PROTECTED]>
* 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 <[EMAIL PROTECTED]>
@@ -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 <[EMAIL PROTECTED]>
@@ -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 <[EMAIL PROTECTED]>
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.119.2.37&r2=1.119.2.38&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.119.2.37 php-src/run-tests.php:1.119.2.38
--- php-src/run-tests.php:1.119.2.37 Wed May 26 14:23:23 2004
+++ php-src/run-tests.php Thu Dec 16 07:36:40 2004
@@ -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 @@
}
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;
http://cvs.php.net/diff.php/php-src/ext/gd/tests/gif2gd.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/ext/gd/tests/gif2gd.phpt
diff -u php-src/ext/gd/tests/gif2gd.phpt:1.1.2.1
php-src/ext/gd/tests/gif2gd.phpt:1.1.2.2
--- php-src/ext/gd/tests/gif2gd.phpt:1.1.2.1 Wed Dec 4 16:07:10 2002
+++ php-src/ext/gd/tests/gif2gd.phpt Thu Dec 16 07:36:40 2004
@@ -3,7 +3,7 @@
--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");
http://cvs.php.net/diff.php/php-src/ext/gd/tests/gif2jpg.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/ext/gd/tests/gif2jpg.phpt
diff -u php-src/ext/gd/tests/gif2jpg.phpt:1.1.2.1
php-src/ext/gd/tests/gif2jpg.phpt:1.1.2.2
--- php-src/ext/gd/tests/gif2jpg.phpt:1.1.2.1 Wed Dec 4 16:07:10 2002
+++ php-src/ext/gd/tests/gif2jpg.phpt Thu Dec 16 07:36:40 2004
@@ -3,7 +3,7 @@
--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");
http://cvs.php.net/diff.php/php-src/ext/gd/tests/gif2png.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/ext/gd/tests/gif2png.phpt
diff -u php-src/ext/gd/tests/gif2png.phpt:1.1.2.1
php-src/ext/gd/tests/gif2png.phpt:1.1.2.2
--- php-src/ext/gd/tests/gif2png.phpt:1.1.2.1 Wed Dec 4 16:07:10 2002
+++ php-src/ext/gd/tests/gif2png.phpt Thu Dec 16 07:36:40 2004
@@ -3,7 +3,7 @@
--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");
http://cvs.php.net/diff.php/php-src/ext/gd/tests/jpeg2png.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u
Index: php-src/ext/gd/tests/jpeg2png.phpt
diff -u php-src/ext/gd/tests/jpeg2png.phpt:1.1.2.2
php-src/ext/gd/tests/jpeg2png.phpt:1.1.2.3
--- php-src/ext/gd/tests/jpeg2png.phpt:1.1.2.2 Wed Dec 11 17:37:35 2002
+++ php-src/ext/gd/tests/jpeg2png.phpt Thu Dec 16 07:36:40 2004
@@ -3,7 +3,7 @@
--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");
http://cvs.php.net/diff.php/php-src/ext/gd/tests/jpg2gd.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/ext/gd/tests/jpg2gd.phpt
diff -u php-src/ext/gd/tests/jpg2gd.phpt:1.1.2.1
php-src/ext/gd/tests/jpg2gd.phpt:1.1.2.2
--- php-src/ext/gd/tests/jpg2gd.phpt:1.1.2.1 Wed Dec 4 16:07:10 2002
+++ php-src/ext/gd/tests/jpg2gd.phpt Thu Dec 16 07:36:41 2004
@@ -3,7 +3,7 @@
--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");
http://cvs.php.net/diff.php/php-src/ext/gd/tests/png2gd.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/ext/gd/tests/png2gd.phpt
diff -u php-src/ext/gd/tests/png2gd.phpt:1.1.2.1
php-src/ext/gd/tests/png2gd.phpt:1.1.2.2
--- php-src/ext/gd/tests/png2gd.phpt:1.1.2.1 Wed Dec 4 16:07:10 2002
+++ php-src/ext/gd/tests/png2gd.phpt Thu Dec 16 07:36:41 2004
@@ -3,7 +3,7 @@
--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");
http://cvs.php.net/diff.php/php-src/ext/gd/tests/xpm2gd.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/ext/gd/tests/xpm2gd.phpt
diff -u php-src/ext/gd/tests/xpm2gd.phpt:1.1.2.1
php-src/ext/gd/tests/xpm2gd.phpt:1.1.2.2
--- php-src/ext/gd/tests/xpm2gd.phpt:1.1.2.1 Wed Dec 4 16:07:10 2002
+++ php-src/ext/gd/tests/xpm2gd.phpt Thu Dec 16 07:36:41 2004
@@ -3,7 +3,7 @@
--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");
http://cvs.php.net/diff.php/php-src/ext/gd/tests/xpm2jpg.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/ext/gd/tests/xpm2jpg.phpt
diff -u php-src/ext/gd/tests/xpm2jpg.phpt:1.1.2.1
php-src/ext/gd/tests/xpm2jpg.phpt:1.1.2.2
--- php-src/ext/gd/tests/xpm2jpg.phpt:1.1.2.1 Wed Dec 4 16:07:10 2002
+++ php-src/ext/gd/tests/xpm2jpg.phpt Thu Dec 16 07:36:41 2004
@@ -3,7 +3,7 @@
--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");
http://cvs.php.net/diff.php/php-src/ext/gd/tests/xpm2png.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/ext/gd/tests/xpm2png.phpt
diff -u php-src/ext/gd/tests/xpm2png.phpt:1.1.2.1
php-src/ext/gd/tests/xpm2png.phpt:1.1.2.2
--- php-src/ext/gd/tests/xpm2png.phpt:1.1.2.1 Wed Dec 4 16:07:10 2002
+++ php-src/ext/gd/tests/xpm2png.phpt Thu Dec 16 07:36:41 2004
@@ -3,7 +3,7 @@
--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");
http://cvs.php.net/diff.php/php-src/ext/informix/ifx.ec?r1=1.69.2.27&r2=1.69.2.28&ty=u
Index: php-src/ext/informix/ifx.ec
diff -u php-src/ext/informix/ifx.ec:1.69.2.27
php-src/ext/informix/ifx.ec:1.69.2.28
--- php-src/ext/informix/ifx.ec:1.69.2.27 Mon May 31 20:52:14 2004
+++ php-src/ext/informix/ifx.ec Thu Dec 16 07:36:41 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ifx.ec,v 1.69.2.27 2004/06/01 00:52:14 abies Exp $ */
+/* $Id: ifx.ec,v 1.69.2.28 2004/12/16 12:36:41 sniper Exp $ */
/* -------------------------------------------------------------------
* if you want a function reference : "grep '^\*\*' ifx.ec" will give
@@ -498,7 +498,7 @@
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);
http://cvs.php.net/diff.php/php-src/ext/mbstring/tests/mb_send_mail05.phpt?r1=1.1.2.4&r2=1.1.2.5&ty=u
Index: php-src/ext/mbstring/tests/mb_send_mail05.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail05.phpt:1.1.2.4
php-src/ext/mbstring/tests/mb_send_mail05.phpt:1.1.2.5
--- php-src/ext/mbstring/tests/mb_send_mail05.phpt:1.1.2.4 Fri Oct 3
13:07:50 2003
+++ php-src/ext/mbstring/tests/mb_send_mail05.phpt Thu Dec 16 07:36:42 2004
@@ -6,7 +6,7 @@
die("skip mb_send_mail() not available");
}
if ([EMAIL PROTECTED]('GB2312')) {
- die("skip GB2312 encoding is not avaliable on this platform");
+ die("skip GB2312 encoding is not available on this platform");
}
?>
--INI--
http://cvs.php.net/diff.php/php-src/ext/mbstring/tests/mb_send_mail06.phpt?r1=1.1.2.4&r2=1.1.2.5&ty=u
Index: php-src/ext/mbstring/tests/mb_send_mail06.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail06.phpt:1.1.2.4
php-src/ext/mbstring/tests/mb_send_mail06.phpt:1.1.2.5
--- php-src/ext/mbstring/tests/mb_send_mail06.phpt:1.1.2.4 Fri Oct 3
13:07:50 2003
+++ php-src/ext/mbstring/tests/mb_send_mail06.phpt Thu Dec 16 07:36:42 2004
@@ -6,7 +6,7 @@
die("skip mb_send_mail() not available");
}
if ([EMAIL PROTECTED]('BIG5')) {
- die("skip BIG5 encoding is not avaliable on this platform");
+ die("skip BIG5 encoding is not available on this platform");
}
?>
--INI--
http://cvs.php.net/diff.php/php-src/ext/mbstring/tests/mb_send_mail07.phpt?r1=1.3.2.2&r2=1.3.2.3&ty=u
Index: php-src/ext/mbstring/tests/mb_send_mail07.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail07.phpt:1.3.2.2
php-src/ext/mbstring/tests/mb_send_mail07.phpt:1.3.2.3
--- php-src/ext/mbstring/tests/mb_send_mail07.phpt:1.3.2.2 Fri Oct 3
13:07:50 2003
+++ php-src/ext/mbstring/tests/mb_send_mail07.phpt Thu Dec 16 07:36:42 2004
@@ -6,7 +6,7 @@
die("skip mb_send_mail() not available");
}
if ([EMAIL PROTECTED]('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--
http://cvs.php.net/diff.php/php-src/ext/mhash/tests/skip.inc?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/ext/mhash/tests/skip.inc
diff -u php-src/ext/mhash/tests/skip.inc:1.1.2.1
php-src/ext/mhash/tests/skip.inc:1.1.2.2
--- php-src/ext/mhash/tests/skip.inc:1.1.2.1 Wed Nov 20 01:53:33 2002
+++ php-src/ext/mhash/tests/skip.inc Thu Dec 16 07:36:42 2004
@@ -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
http://cvs.php.net/diff.php/php-src/ext/mime_magic/mime_magic.c?r1=1.13.2.12&r2=1.13.2.13&ty=u
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.13.2.12
php-src/ext/mime_magic/mime_magic.c:1.13.2.13
--- php-src/ext/mime_magic/mime_magic.c:1.13.2.12 Thu Jan 15 01:09:43 2004
+++ php-src/ext/mime_magic/mime_magic.c Thu Dec 16 07:36:42 2004
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mime_magic.c,v 1.13.2.12 2004/01/15 06:09:43 sniper Exp $
+ $Id: mime_magic.c,v 1.13.2.13 2004/12/16 12:36:42 sniper Exp $
This module contains a lot of stuff taken from Apache mod_mime_magic,
so the license section is a little bit longer than usual:
@@ -314,7 +314,7 @@
}
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;
}
http://cvs.php.net/diff.php/php-src/ext/pcntl/tests/001.phpt?r1=1.6&r2=1.6.2.1&ty=u
Index: php-src/ext/pcntl/tests/001.phpt
diff -u php-src/ext/pcntl/tests/001.phpt:1.6
php-src/ext/pcntl/tests/001.phpt:1.6.2.1
--- php-src/ext/pcntl/tests/001.phpt:1.6 Thu Nov 7 20:08:52 2002
+++ php-src/ext/pcntl/tests/001.phpt Thu Dec 16 07:36:42 2004
@@ -3,7 +3,7 @@
--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--
http://cvs.php.net/diff.php/php-src/ext/pspell/tests/01pspell_basic.phpt?r1=1.2.2.2&r2=1.2.2.3&ty=u
Index: php-src/ext/pspell/tests/01pspell_basic.phpt
diff -u php-src/ext/pspell/tests/01pspell_basic.phpt:1.2.2.2
php-src/ext/pspell/tests/01pspell_basic.phpt:1.2.2.3
--- php-src/ext/pspell/tests/01pspell_basic.phpt:1.2.2.2 Sat Aug 9
14:40:53 2003
+++ php-src/ext/pspell/tests/01pspell_basic.phpt Thu Dec 16 07:36:42 2004
@@ -4,13 +4,13 @@
<?php
if (!extension_loaded("pspell")) print "skip";
if ([EMAIL PROTECTED] ("en", "", "", "",
(PSPELL_FAST|PSPELL_RUN_TOGETHER))) {
- die("skip English dictionary is not avaliable");
+ die("skip English dictionary is not available");
}
?>
--POST--
--GET--
--FILE--
-<?php // $Id: 01pspell_basic.phpt,v 1.2.2.2 2003/08/09 18:40:53 iliaa Exp $
+<?php // $Id: 01pspell_basic.phpt,v 1.2.2.3 2004/12/16 12:36:42 sniper Exp $
error_reporting(E_ALL);
$string = "";
http://cvs.php.net/diff.php/php-src/ext/shmop/tests/001.phpt?r1=1.1.2.1&r2=1.1.2.2&ty=u
Index: php-src/ext/shmop/tests/001.phpt
diff -u php-src/ext/shmop/tests/001.phpt:1.1.2.1
php-src/ext/shmop/tests/001.phpt:1.1.2.2
--- php-src/ext/shmop/tests/001.phpt:1.1.2.1 Wed Nov 20 11:08:36 2002
+++ php-src/ext/shmop/tests/001.phpt Thu Dec 16 07:36:43 2004
@@ -3,7 +3,7 @@
--SKIPIF--
<?php
if (!extension_loaded("shmop")) {
- die("skip shmop() extension not avaliable");
+ die("skip shmop() extension not available");
}
?>
--FILE--
http://cvs.php.net/diff.php/php-src/ext/standard/tests/image/getimagesize_swc.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/standard/tests/image/getimagesize_swc.phpt
diff -u php-src/ext/standard/tests/image/getimagesize_swc.phpt:1.1
php-src/ext/standard/tests/image/getimagesize_swc.phpt:1.1.2.1
--- php-src/ext/standard/tests/image/getimagesize_swc.phpt:1.1 Tue Nov 12
12:47:20 2002
+++ php-src/ext/standard/tests/image/getimagesize_swc.phpt Thu Dec 16
07:36:43 2004
@@ -3,7 +3,7 @@
--SKIPIF--
<?php
if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
- die("skip zlib extension is not avaliable");
+ die("skip zlib extension is not available");
}
?>
--FILE--
http://cvs.php.net/diff.php/php-src/pear/CMD.php?r1=1.4.10.9&r2=1.4.10.10&ty=u
Index: php-src/pear/CMD.php
diff -u php-src/pear/CMD.php:1.4.10.9 php-src/pear/CMD.php:1.4.10.10
--- php-src/pear/CMD.php:1.4.10.9 Sun Jan 25 20:26:43 2004
+++ php-src/pear/CMD.php Thu Dec 16 07:36:43 2004
@@ -16,7 +16,7 @@
// | Author: Anders Johannsen <[EMAIL PROTECTED]> |
// +----------------------------------------------------------------------+
//
-define('CMD_RCSID', '$Id: CMD.php,v 1.4.10.9 2004/01/26 01:26:43 pajoye Exp
$');
+define('CMD_RCSID', '$Id: CMD.php,v 1.4.10.10 2004/12/16 12:36:43 sniper Exp
$');
/**
* The Cmd:: class implements an abstraction for various ways
@@ -25,7 +25,7 @@
* register_shutdown_function() or as a detached process using nohup).
*
* @author Anders Johannsen <[EMAIL PROTECTED]>
- * @version $Revision: 1.4.10.9 $
+ * @version $Revision: 1.4.10.10 $
**/
require_once 'PEAR.php';
@@ -231,7 +231,7 @@
/**
* 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
*
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.36&r2=1.1.2.37&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.36
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.37
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.36 Mon Dec 6 13:55:16 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Thu Dec 16 07:36:43 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.36 2004/12/06 18:55:16 stas Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.37 2004/12/16 12:36:43 sniper Exp $ */
#include <fcntl.h>
@@ -140,7 +140,7 @@
/*
* 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) {
http://cvs.php.net/diff.php/php-src/tests/lang/overload_leak.phpt?r1=1.1.2.2&r2=1.1.2.3&ty=u
Index: php-src/tests/lang/overload_leak.phpt
diff -u php-src/tests/lang/overload_leak.phpt:1.1.2.2
php-src/tests/lang/overload_leak.phpt:1.1.2.3
--- php-src/tests/lang/overload_leak.phpt:1.1.2.2 Fri Nov 28 23:47:40 2003
+++ php-src/tests/lang/overload_leak.phpt Thu Dec 16 07:36:43 2004
@@ -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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
