sniper          Thu Dec 16 07:35:44 2004 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src    run-tests.php 
    /ZendEngine2        ChangeLog 
    /php-src/ext/gd/tests       gif2gd.phpt gif2jpg.phpt gif2png.phpt 
                                imagefilter.phpt imagefttext.phpt 
                                jpeg2png.phpt jpg2gd.phpt png2gd.phpt 
                                xbm2png.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/sapi/apache2handler        sapi_apache2.c 
  Log:
  - MFH: Fix typo (avaliable -> available). (bug #28725)
  
  
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.195.2.2&r2=1.195.2.3&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.195.2.2 php-src/run-tests.php:1.195.2.3
--- php-src/run-tests.php:1.195.2.2     Mon Sep 27 13:30:47 2004
+++ php-src/run-tests.php       Thu Dec 16 07:35:37 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.
  */
@@ -699,7 +699,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/ZendEngine2/ChangeLog?r1=1.500&r2=1.500.2.1&ty=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.500 ZendEngine2/ChangeLog:1.500.2.1
--- ZendEngine2/ChangeLog:1.500 Wed Jul 14 20:33:10 2004
+++ ZendEngine2/ChangeLog       Thu Dec 16 07:35:37 2004
@@ -4935,7 +4935,7 @@
 2003-06-10  Jani Taskinen  <[EMAIL PROTECTED]>
 
     * zend_multiply.h:
-      - Missing $Id: ChangeLog,v 1.500 2004/07/15 00:33:10 changelog Exp $ tag
+      - Missing $Id: ChangeLog,v 1.500.2.1 2004/12/16 12:35:37 sniper Exp $ tag
 
 2003-06-10  James Cox  <[EMAIL PROTECTED]>
 
@@ -6446,13 +6446,13 @@
 2003-02-08  Ilia Alshanetsky  <[EMAIL PROTECTED]>
 
     * 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  <[EMAIL PROTECTED]>
 
     * 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.
 
@@ -6659,7 +6659,7 @@
       zend_types.h
       zend_variables.c
       zend_variables.h:
-      - Added some missing CVS $Id: ChangeLog,v 1.500 2004/07/15 00:33:10 
changelog Exp $ tags, headers and footers.
+      - Added some missing CVS $Id: ChangeLog,v 1.500.2.1 2004/12/16 12:35:37 
sniper Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  <[EMAIL PROTECTED]>
 
http://cvs.php.net/diff.php/php-src/ext/gd/tests/gif2gd.phpt?r1=1.1&r2=1.1.4.1&ty=u
Index: php-src/ext/gd/tests/gif2gd.phpt
diff -u php-src/ext/gd/tests/gif2gd.phpt:1.1 
php-src/ext/gd/tests/gif2gd.phpt:1.1.4.1
--- php-src/ext/gd/tests/gif2gd.phpt:1.1        Wed Dec  4 16:04:07 2002
+++ php-src/ext/gd/tests/gif2gd.phpt    Thu Dec 16 07:35:38 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&r2=1.1.4.1&ty=u
Index: php-src/ext/gd/tests/gif2jpg.phpt
diff -u php-src/ext/gd/tests/gif2jpg.phpt:1.1 
php-src/ext/gd/tests/gif2jpg.phpt:1.1.4.1
--- php-src/ext/gd/tests/gif2jpg.phpt:1.1       Wed Dec  4 16:04:07 2002
+++ php-src/ext/gd/tests/gif2jpg.phpt   Thu Dec 16 07:35:39 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&r2=1.1.4.1&ty=u
Index: php-src/ext/gd/tests/gif2png.phpt
diff -u php-src/ext/gd/tests/gif2png.phpt:1.1 
php-src/ext/gd/tests/gif2png.phpt:1.1.4.1
--- php-src/ext/gd/tests/gif2png.phpt:1.1       Wed Dec  4 16:04:07 2002
+++ php-src/ext/gd/tests/gif2png.phpt   Thu Dec 16 07:35:39 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/imagefilter.phpt?r1=1.2.2.1&r2=1.2.2.2&ty=u
Index: php-src/ext/gd/tests/imagefilter.phpt
diff -u php-src/ext/gd/tests/imagefilter.phpt:1.2.2.1 
php-src/ext/gd/tests/imagefilter.phpt:1.2.2.2
--- php-src/ext/gd/tests/imagefilter.phpt:1.2.2.1       Tue Nov 23 12:18:37 2004
+++ php-src/ext/gd/tests/imagefilter.phpt       Thu Dec 16 07:35:39 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 this test requires bundled gd library.");
http://cvs.php.net/diff.php/php-src/ext/gd/tests/imagefttext.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/gd/tests/imagefttext.phpt
diff -u php-src/ext/gd/tests/imagefttext.phpt:1.1 
php-src/ext/gd/tests/imagefttext.phpt:1.1.2.1
--- php-src/ext/gd/tests/imagefttext.phpt:1.1   Sat Nov 23 20:32:15 2002
+++ php-src/ext/gd/tests/imagefttext.phpt       Thu Dec 16 07:35:39 2004
@@ -3,7 +3,7 @@
 --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.");
http://cvs.php.net/diff.php/php-src/ext/gd/tests/jpeg2png.phpt?r1=1.2&r2=1.2.2.1&ty=u
Index: php-src/ext/gd/tests/jpeg2png.phpt
diff -u php-src/ext/gd/tests/jpeg2png.phpt:1.2 
php-src/ext/gd/tests/jpeg2png.phpt:1.2.2.1
--- php-src/ext/gd/tests/jpeg2png.phpt:1.2      Wed Dec 11 17:37:05 2002
+++ php-src/ext/gd/tests/jpeg2png.phpt  Thu Dec 16 07:35:39 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&r2=1.1.4.1&ty=u
Index: php-src/ext/gd/tests/jpg2gd.phpt
diff -u php-src/ext/gd/tests/jpg2gd.phpt:1.1 
php-src/ext/gd/tests/jpg2gd.phpt:1.1.4.1
--- php-src/ext/gd/tests/jpg2gd.phpt:1.1        Wed Dec  4 16:04:07 2002
+++ php-src/ext/gd/tests/jpg2gd.phpt    Thu Dec 16 07:35:39 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&r2=1.1.4.1&ty=u
Index: php-src/ext/gd/tests/png2gd.phpt
diff -u php-src/ext/gd/tests/png2gd.phpt:1.1 
php-src/ext/gd/tests/png2gd.phpt:1.1.4.1
--- php-src/ext/gd/tests/png2gd.phpt:1.1        Wed Dec  4 16:04:07 2002
+++ php-src/ext/gd/tests/png2gd.phpt    Thu Dec 16 07:35:39 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/xbm2png.phpt?r1=1.1&r2=1.1.2.1&ty=u
Index: php-src/ext/gd/tests/xbm2png.phpt
diff -u php-src/ext/gd/tests/xbm2png.phpt:1.1 
php-src/ext/gd/tests/xbm2png.phpt:1.1.2.1
--- php-src/ext/gd/tests/xbm2png.phpt:1.1       Sat Feb  1 20:34:54 2003
+++ php-src/ext/gd/tests/xbm2png.phpt   Thu Dec 16 07:35:39 2004
@@ -3,7 +3,7 @@
 --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");
http://cvs.php.net/diff.php/php-src/ext/gd/tests/xpm2gd.phpt?r1=1.1&r2=1.1.4.1&ty=u
Index: php-src/ext/gd/tests/xpm2gd.phpt
diff -u php-src/ext/gd/tests/xpm2gd.phpt:1.1 
php-src/ext/gd/tests/xpm2gd.phpt:1.1.4.1
--- php-src/ext/gd/tests/xpm2gd.phpt:1.1        Wed Dec  4 16:04:07 2002
+++ php-src/ext/gd/tests/xpm2gd.phpt    Thu Dec 16 07:35: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/xpm2jpg.phpt?r1=1.1&r2=1.1.4.1&ty=u
Index: php-src/ext/gd/tests/xpm2jpg.phpt
diff -u php-src/ext/gd/tests/xpm2jpg.phpt:1.1 
php-src/ext/gd/tests/xpm2jpg.phpt:1.1.4.1
--- php-src/ext/gd/tests/xpm2jpg.phpt:1.1       Wed Dec  4 16:04:07 2002
+++ php-src/ext/gd/tests/xpm2jpg.phpt   Thu Dec 16 07:35: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/xpm2png.phpt?r1=1.1&r2=1.1.4.1&ty=u
Index: php-src/ext/gd/tests/xpm2png.phpt
diff -u php-src/ext/gd/tests/xpm2png.phpt:1.1 
php-src/ext/gd/tests/xpm2png.phpt:1.1.4.1
--- php-src/ext/gd/tests/xpm2png.phpt:1.1       Wed Dec  4 16:04:07 2002
+++ php-src/ext/gd/tests/xpm2png.phpt   Thu Dec 16 07:35: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.107&r2=1.107.2.1&ty=u
Index: php-src/ext/informix/ifx.ec
diff -u php-src/ext/informix/ifx.ec:1.107 php-src/ext/informix/ifx.ec:1.107.2.1
--- php-src/ext/informix/ifx.ec:1.107   Mon May 31 20:49:59 2004
+++ php-src/ext/informix/ifx.ec Thu Dec 16 07:35:41 2004
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: ifx.ec,v 1.107 2004/06/01 00:49:59 abies Exp $ */
+/* $Id: ifx.ec,v 1.107.2.1 2004/12/16 12:35:41 sniper Exp $ */
 
 /* -------------------------------------------------------------------
  * if you want a function reference : "grep '^\*\*' ifx.ec" will give
@@ -497,7 +497,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.5&r2=1.5.2.1&ty=u
Index: php-src/ext/mbstring/tests/mb_send_mail05.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail05.phpt:1.5 
php-src/ext/mbstring/tests/mb_send_mail05.phpt:1.5.2.1
--- php-src/ext/mbstring/tests/mb_send_mail05.phpt:1.5  Fri Sep 26 07:08:54 2003
+++ php-src/ext/mbstring/tests/mb_send_mail05.phpt      Thu Dec 16 07:35:41 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.5&r2=1.5.2.1&ty=u
Index: php-src/ext/mbstring/tests/mb_send_mail06.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail06.phpt:1.5 
php-src/ext/mbstring/tests/mb_send_mail06.phpt:1.5.2.1
--- php-src/ext/mbstring/tests/mb_send_mail06.phpt:1.5  Fri Sep 26 07:08:54 2003
+++ php-src/ext/mbstring/tests/mb_send_mail06.phpt      Thu Dec 16 07:35:41 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.4&r2=1.4.2.1&ty=u
Index: php-src/ext/mbstring/tests/mb_send_mail07.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail07.phpt:1.4 
php-src/ext/mbstring/tests/mb_send_mail07.phpt:1.4.2.1
--- php-src/ext/mbstring/tests/mb_send_mail07.phpt:1.4  Fri Sep 26 07:08:54 2003
+++ php-src/ext/mbstring/tests/mb_send_mail07.phpt      Thu Dec 16 07:35:41 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&r2=1.1.4.1&ty=u
Index: php-src/ext/mhash/tests/skip.inc
diff -u php-src/ext/mhash/tests/skip.inc:1.1 
php-src/ext/mhash/tests/skip.inc:1.1.4.1
--- php-src/ext/mhash/tests/skip.inc:1.1        Wed Nov 20 01:48:39 2002
+++ php-src/ext/mhash/tests/skip.inc    Thu Dec 16 07:35: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.37&r2=1.37.2.1&ty=u
Index: php-src/ext/mime_magic/mime_magic.c
diff -u php-src/ext/mime_magic/mime_magic.c:1.37 
php-src/ext/mime_magic/mime_magic.c:1.37.2.1
--- php-src/ext/mime_magic/mime_magic.c:1.37    Fri Jan 16 06:15:13 2004
+++ php-src/ext/mime_magic/mime_magic.c Thu Dec 16 07:35:42 2004
@@ -15,7 +15,7 @@
   | Author: Hartmut Holzgraefe  <[EMAIL PROTECTED]>                       |
   +----------------------------------------------------------------------+
 
-  $Id: mime_magic.c,v 1.37 2004/01/16 11:15:13 sniper Exp $ 
+  $Id: mime_magic.c,v 1.37.2.1 2004/12/16 12:35: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:
@@ -350,7 +350,7 @@
 
        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;
        } 
 
http://cvs.php.net/diff.php/php-src/ext/pcntl/tests/001.phpt?r1=1.7&r2=1.7.2.1&ty=u
Index: php-src/ext/pcntl/tests/001.phpt
diff -u php-src/ext/pcntl/tests/001.phpt:1.7 
php-src/ext/pcntl/tests/001.phpt:1.7.2.1
--- php-src/ext/pcntl/tests/001.phpt:1.7        Wed May 19 04:56:49 2004
+++ php-src/ext/pcntl/tests/001.phpt    Thu Dec 16 07:35: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";
 ?>
 --FILE--
 <?php 
http://cvs.php.net/diff.php/php-src/ext/pspell/tests/01pspell_basic.phpt?r1=1.5&r2=1.5.2.1&ty=u
Index: php-src/ext/pspell/tests/01pspell_basic.phpt
diff -u php-src/ext/pspell/tests/01pspell_basic.phpt:1.5 
php-src/ext/pspell/tests/01pspell_basic.phpt:1.5.2.1
--- php-src/ext/pspell/tests/01pspell_basic.phpt:1.5    Wed May 19 04:54:51 2004
+++ php-src/ext/pspell/tests/01pspell_basic.phpt        Thu Dec 16 07:35:42 2004
@@ -4,11 +4,11 @@
 <?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");
        }
 ?>
 --FILE--
-<?php // $Id: 01pspell_basic.phpt,v 1.5 2004/05/19 08:54:51 helly Exp $
+<?php // $Id: 01pspell_basic.phpt,v 1.5.2.1 2004/12/16 12:35:42 sniper Exp $
 
 error_reporting(E_ALL);
 $string = "";
http://cvs.php.net/diff.php/php-src/ext/shmop/tests/001.phpt?r1=1.1&r2=1.1.4.1&ty=u
Index: php-src/ext/shmop/tests/001.phpt
diff -u php-src/ext/shmop/tests/001.phpt:1.1 
php-src/ext/shmop/tests/001.phpt:1.1.4.1
--- php-src/ext/shmop/tests/001.phpt:1.1        Wed Nov 20 10:56:56 2002
+++ php-src/ext/shmop/tests/001.phpt    Thu Dec 16 07:35:42 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.12.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.12.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:35:42 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/sapi/apache2handler/sapi_apache2.c?r1=1.40.2.4&r2=1.40.2.5&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.4 
php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.5
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.4 Mon Dec  6 13:55:38 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Thu Dec 16 07:35:43 2004
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.40.2.4 2004/12/06 18:55:38 stas Exp $ */
+/* $Id: sapi_apache2.c,v 1.40.2.5 2004/12/16 12:35:43 sniper Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -142,7 +142,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) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to