From 02e4d7a290ae437688b3a3d114621a1d32444560 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Mon, 10 Jun 2013 14:20:18 -0700 Subject: [PATCH] Merge branch 'pull-request/341' * pull-request/341: (23 commits) typofixes --- README.TESTING | 2 +- Zend/ZEND_CHANGES | 2 +- Zend/tests/019.phpt | 2 +- Zend/tests/bug32428.phpt | 2 +- Zend/tests/gc_007.phpt | 2 +- Zend/tests/gc_008.phpt | 2 +- Zend/tests/gc_009.phpt | 2 +- Zend/zend_API.c | 2 +- Zend/zend_compile.c | 4 +- Zend/zend_operators.c | 2 +- acinclude.m4 | 2 +- build/shtool | 4 +- ext/bz2/bz2.c | 2 +- ext/com_dotnet/com_variant.c | 2 +- .../tests/date_sunrise_and_sunset_basic.phpt | 2 +- ext/dba/tests/dba_cdb_read.phpt | 2 +- ext/dom/element.c | 2 +- ext/dom/tests/DOMNode_removeChild_basic.phpt | 4 +- ext/enchant/enchant.c | 2 +- ext/exif/tests/exif_tagname_variation1.phpt | 2 +- ext/fileinfo/tests/finfo_phpinfo_basic.phpt | 2 +- ext/fileinfo/tests/magic | 6 +- ext/gd/tests/imagecopyresampled_basic.phpt | 6 +- ext/hash/tests/mhash_002.phpt | 2 +- ext/imap/tests/imap_include.inc | 2 +- ext/interbase/tests/005.phpt | 4 +- ext/intl/doc/Tutorial.txt | 2 +- ext/intl/doc/grapheme_api.php | 4 +- ext/intl/doc/msgfmt_api.php | 4 +- ext/libxml/tests/bug61367-read.phpt | 2 +- ext/mbstring/README_PHP3-i18n-ja | 2 +- .../libmbfl/filters/unicode_table_jis2004.h | 2 +- ext/mbstring/oniguruma/HISTORY | 2 +- ext/mbstring/php_mbregex.c | 2 +- ext/mysqli/tests/bug34810.phpt | 2 +- ext/mysqlnd/mysqlnd.c | 2 +- ext/mysqlnd/mysqlnd_result.c | 4 +- ext/oci8/package.xml | 2 +- ext/oci8/tests/conn_attr.inc | 2 +- ext/oci8/tests/conn_attr_4.phpt | 6 +- ext/odbc/php_odbc_includes.h | 2 +- ext/openssl/tests/openssl.cnf | 2 +- ext/openssl/xp_ssl.c | 2 +- ext/pcre/pcrelib/ChangeLog | 2 +- ext/pcre/pcrelib/pcre_compile.c | 2 +- ext/pcre/tests/preg_replace_basic.phpt | 2 +- ext/pcre/tests/preg_replace_edit_basic.phpt | 2 +- ext/pcre/tests/preg_split_basic.phpt | 2 +- ext/pdo/php_pdo_driver.h | 2 +- ext/pgsql/README | 2 +- ext/phar/func_interceptors.c | 2 +- ext/phar/tests/files/openssl.cnf | 2 +- ext/posix/config.m4 | 2 +- ext/shmop/README | 6 +- ext/snmp/snmp.c | 6 +- ext/soap/TODO | 2 +- ext/soap/TODO.old | 4 +- ext/soap/interop/client_round2_params.php | 2 +- ext/soap/php_http.c | 2 +- ext/soap/soap.c | 2 +- ext/soap/tests/bugs/bug27742.wsdl | 4 +- ext/spl/internal/cachingiterator.inc | 2 +- ext/spl/tests/iterator_031.phpt | 2 +- ext/spl/tests/spl_004.phpt | 6 +- ext/sqlite3/libsqlite/sqlite3.c | 70 +++++++++--------- ext/standard/filestat.c | 2 +- ext/standard/ftp_fopen_wrapper.c | 4 +- ext/standard/image.c | 2 +- ext/standard/streamsfuncs.c | 2 +- .../tests/array/array_combine_variation3.phpt | 2 +- .../tests/array/array_fill_basic.phpt | 2 +- .../tests/array/array_fill_variation4.phpt | 2 +- .../array_intersect_assoc_variation3.phpt | 2 +- .../array_intersect_assoc_variation4.phpt | 2 +- .../array/array_intersect_variation3.phpt | 2 +- .../array/array_intersect_variation4.phpt | 2 +- .../tests/array/array_key_exists.phpt | 2 +- .../array_merge_recursive_variation3.phpt | 2 +- .../tests/array/array_pad_variation6.phpt | 2 +- .../tests/array/array_unique_variation2.phpt | 2 +- .../tests/array/array_unshift_variation9.phpt | 2 +- .../tests/array/array_walk_error2.phpt | 2 +- .../array/array_walk_recursive_error2.phpt | 2 +- .../tests/array/arsort_variation1.phpt | 2 +- .../tests/array/arsort_variation2.phpt | 2 +- .../tests/array/asort_variation1.phpt | 2 +- .../tests/array/asort_variation2.phpt | 2 +- ext/standard/tests/array/bug40709.phpt | 10 +-- .../tests/array/krsort_variation1.phpt | 2 +- .../tests/array/krsort_variation2.phpt | 2 +- .../tests/array/ksort_variation1.phpt | 2 +- .../tests/array/ksort_variation2.phpt | 2 +- ext/standard/tests/array/sizeof_basic2.phpt | 2 +- .../tests/array/sizeof_variation4.phpt | 2 +- ext/standard/tests/array/sort_variation1.phpt | 2 +- ext/standard/tests/array/sort_variation2.phpt | 2 +- ext/standard/tests/array/uasort_error.phpt | 2 +- ext/standard/tests/array/usort_error2.phpt | 2 +- ext/standard/tests/file/007_variation10.phpt | 2 +- .../tests/file/007_variation11-win32.phpt | 6 +- ext/standard/tests/file/007_variation11.phpt | 6 +- .../tests/file/007_variation12-win32.phpt | 4 +- ext/standard/tests/file/007_variation12.phpt | 4 +- .../tests/file/007_variation13-win32.phpt | 2 +- ext/standard/tests/file/007_variation13.phpt | 2 +- ext/standard/tests/file/007_variation14.phpt | 2 +- ext/standard/tests/file/007_variation15.phpt | 4 +- ext/standard/tests/file/007_variation16.phpt | 2 +- ext/standard/tests/file/007_variation18.phpt | 2 +- ext/standard/tests/file/007_variation19.phpt | 6 +- ext/standard/tests/file/007_variation2.phpt | 2 +- ext/standard/tests/file/007_variation20.phpt | 4 +- ext/standard/tests/file/007_variation21.phpt | 2 +- ext/standard/tests/file/007_variation22.phpt | 2 +- ext/standard/tests/file/007_variation23.phpt | 4 +- ext/standard/tests/file/007_variation24.phpt | 2 +- ext/standard/tests/file/007_variation3.phpt | 6 +- ext/standard/tests/file/007_variation4.phpt | 4 +- ext/standard/tests/file/007_variation5.phpt | 2 +- ext/standard/tests/file/007_variation6.phpt | 2 +- ext/standard/tests/file/007_variation7.phpt | 4 +- ext/standard/tests/file/007_variation8.phpt | 2 +- ext/standard/tests/file/bug52820.phpt | 2 +- ext/standard/tests/file/fgetc_variation3.phpt | 2 +- ext/standard/tests/file/fgetc_variation4.phpt | 2 +- .../tests/file/fgetcsv_variation1.phpt | 2 +- .../tests/file/fgetcsv_variation10.phpt | 2 +- .../tests/file/fgetcsv_variation11.phpt | 2 +- .../tests/file/fgetcsv_variation12.phpt | 2 +- .../tests/file/fgetcsv_variation13.phpt | 2 +- .../tests/file/fgetcsv_variation14.phpt | 2 +- .../tests/file/fgetcsv_variation15.phpt | 2 +- .../tests/file/fgetcsv_variation16.phpt | 2 +- .../tests/file/fgetcsv_variation17.phpt | 2 +- .../tests/file/fgetcsv_variation18.phpt | 2 +- .../tests/file/fgetcsv_variation19.phpt | 2 +- .../tests/file/fgetcsv_variation2.phpt | 2 +- .../tests/file/fgetcsv_variation20.phpt | 2 +- .../tests/file/fgetcsv_variation21.phpt | 2 +- .../tests/file/fgetcsv_variation24.phpt | 2 +- .../tests/file/fgetcsv_variation25.phpt | 2 +- .../tests/file/fgetcsv_variation27.phpt | 2 +- .../tests/file/fgetcsv_variation28.phpt | 2 +- .../tests/file/fgetcsv_variation29.phpt | 2 +- .../tests/file/fgetcsv_variation3.phpt | 2 +- .../tests/file/fgetcsv_variation31.phpt | 2 +- .../tests/file/fgetcsv_variation4.phpt | 2 +- .../tests/file/fgetcsv_variation5.phpt | 2 +- .../tests/file/fgetcsv_variation6.phpt | 2 +- .../tests/file/fgetcsv_variation7.phpt | 2 +- .../tests/file/fgetcsv_variation8.phpt | 2 +- .../tests/file/fgetcsv_variation9.phpt | 2 +- ext/standard/tests/file/fgets_variation1.phpt | 2 +- ext/standard/tests/file/fgets_variation3.phpt | 4 +- .../tests/file/fgetss_basic2-win32.phpt | 2 +- ext/standard/tests/file/fgetss_basic2.phpt | 2 +- .../tests/file/fgetss_variation1-win32.phpt | 2 +- .../tests/file/fgetss_variation1.phpt | 2 +- .../tests/file/fgetss_variation2.phpt | 2 +- .../tests/file/fgetss_variation3-win32.phpt | 2 +- .../tests/file/fgetss_variation3.phpt | 2 +- .../tests/file/fgetss_variation4.phpt | 2 +- .../tests/file/fgetss_variation5-win32.phpt | 2 +- .../tests/file/fgetss_variation5.phpt | 2 +- .../file/fseek_ftell_rewind_basic2-win32.phpt | 2 +- .../tests/file/fseek_ftell_rewind_basic2.phpt | 2 +- ext/standard/tests/mail/mail_include.inc | 2 +- .../tests/strings/addslashes_variation1.phpt | 2 +- ext/standard/tests/strings/bug36306.phpt | 4 +- ext/standard/tests/strings/bug50847.phpt | 2 +- .../tests/strings/chop_variation1.phpt | 2 +- .../tests/strings/chop_variation2.phpt | 2 +- ...get_html_translation_table_variation1.phpt | 2 +- ...get_html_translation_table_variation2.phpt | 2 +- .../htmlspecialchars_decode_variation3.phpt | 2 +- .../tests/strings/join_variation1.phpt | 2 +- .../tests/strings/join_variation2.phpt | 2 +- .../tests/strings/setlocale_basic1.phpt | 2 +- .../tests/strings/setlocale_basic2.phpt | 2 +- .../tests/strings/setlocale_basic3.phpt | 2 +- .../tests/strings/setlocale_error.phpt | 2 +- .../tests/strings/setlocale_variation1.phpt | 2 +- .../tests/strings/setlocale_variation2.phpt | 2 +- .../tests/strings/setlocale_variation3.phpt | 2 +- .../tests/strings/setlocale_variation4.phpt | 2 +- .../tests/strings/setlocale_variation5.phpt | 2 +- .../tests/strings/strcspn_variation2.phpt | 4 +- .../tests/strings/strip_tags_variation5.phpt | 2 +- .../strings/stripcslashes_variation1.phpt | 2 +- .../strings/stripslashes_variation1.phpt | 2 +- ext/standard/tests/strings/strrchr_basic.phpt | 2 +- .../tests/strings/strspn_variation2.phpt | 4 +- .../tests/strings/strtok_variation1.phpt | 2 +- .../tests/strings/strtok_variation2.phpt | 2 +- ext/standard/tests/strings/trim1.phpt | Bin 2046 -> 2046 bytes ext/standard/tests/strings/trim_error.phpt | 2 +- .../tests/strings/trim_variation1.phpt | 2 +- .../tests/strings/trim_variation2.phpt | 2 +- .../tests/strings/ucwords_variation1.phpt | 2 +- .../tests/strings/ucwords_variation2.phpt | 2 +- .../tests/strings/wordwrap_variation1.phpt | 2 +- .../tests/strings/wordwrap_variation2.phpt | 2 +- .../tests/strings/wordwrap_variation3.phpt | 2 +- .../tests/strings/wordwrap_variation4.phpt | 2 +- ext/standard/uuencode.c | 2 +- ext/sysvmsg/sysvmsg.c | 2 +- ext/sysvsem/tests/sysv.phpt | 6 +- ext/xmlreader/php_xmlreader.c | 8 +- ext/xmlrpc/libxmlrpc/simplestring.c | 2 +- ext/xmlrpc/libxmlrpc/xmlrpc.c | 4 +- ext/zip/lib/zip_open.c | 2 +- ext/zip/tests/bug64342_0.phpt | 2 +- ext/zip/tests/bug64342_1.phpt | 2 +- main/rfc1867.c | 2 +- main/streams/xp_socket.c | 2 +- run-tests.php | 2 +- sapi/apache/mod_php5.c | 2 +- sapi/apache2filter/README | 2 +- sapi/apache2handler/README | 2 +- sapi/apache2handler/sapi_apache2.c | 2 +- sapi/apache_hooks/mod_php5.c | 2 +- sapi/fpm/fpm/fpm_conf.c | 2 +- sapi/thttpd/thttpd.c | 2 +- server-tests-config.php | 2 +- server-tests.php | 2 +- win32/install.txt | 2 +- win32/sendmail.c | 12 +-- win32/signal.h | 2 +- 228 files changed, 317 insertions(+), 317 deletions(-) diff --git a/README.TESTING b/README.TESTING index 75141d50e570d..5e0ee11be05a4 100644 --- a/README.TESTING +++ b/README.TESTING @@ -1,6 +1,6 @@ [IMPORTANT NOTICE] ------------------ - Failed tests usualy indicate a problem with your local system setup + Failed tests usually indicate a problem with your local system setup and not within PHP itself (at least for official PHP release versions). You may decide to automaticaly submit a test summary to our QA workflow at the end of a test run. diff --git a/Zend/ZEND_CHANGES b/Zend/ZEND_CHANGES index 5208ce1623929..4a6dc6cdcf166 100644 --- a/Zend/ZEND_CHANGES +++ b/Zend/ZEND_CHANGES @@ -435,7 +435,7 @@ Changes in the Zend Engine 2.0 that of other object-oriented languages, such as Java: When the last reference to an object is destroyed the object's destructor, which is a class method name __destruct() that - recieves no parameters, is called before the object is freed + receives no parameters, is called before the object is freed from memory. Example: diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt index 70093cd28b927..654f86bb11639 100644 --- a/Zend/tests/019.phpt +++ b/Zend/tests/019.phpt @@ -357,7 +357,7 @@ var_dump($global_var); test_unset3(); var_dump($global_var); -//Note: No error conditions relating to passing arugments can be tested +//Note: No error conditions relating to passing arguments can be tested // because these are not functions but statements, it will result in syntax error. ?> ===DONE=== diff --git a/Zend/tests/bug32428.phpt b/Zend/tests/bug32428.phpt index 0b5ca6aebcf18..e75148fec15fa 100644 --- a/Zend/tests/bug32428.phpt +++ b/Zend/tests/bug32428.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #32428 (The @ warning error supression operator is broken) +Bug #32428 (The @ warning error suppression operator is broken) --FILE-- v) & VT_ARRAY)) { long orig_vt = vt; diff --git a/ext/date/tests/date_sunrise_and_sunset_basic.phpt b/ext/date/tests/date_sunrise_and_sunset_basic.phpt index a96fa830349ed..f89b63fd9334e 100644 --- a/ext/date/tests/date_sunrise_and_sunset_basic.phpt +++ b/ext/date/tests/date_sunrise_and_sunset_basic.phpt @@ -14,7 +14,7 @@ offset: +1 GMT echo "Basic test for date_sunrise() and date_sunset()\n"; -// supress date() function strict msgs +// suppress date() function strict msgs error_reporting(E_ALL & ~E_STRICT); echo date("D M d Y") . ', sunrise time : ' . date_sunrise(time(), SUNFUNCS_RET_STRING, 38.4, -9, 90, 1) . "\n"; diff --git a/ext/dba/tests/dba_cdb_read.phpt b/ext/dba/tests/dba_cdb_read.phpt index 71575f5d85e83..a782a572e9cc0 100644 --- a/ext/dba/tests/dba_cdb_read.phpt +++ b/ext/dba/tests/dba_cdb_read.phpt @@ -20,7 +20,7 @@ DBA CDB handler test (read only) $keys .= $a; $count++; } - // display number of entries and key existance + // display number of entries and key existence echo $count; for ($i=1; $i<8; $i++) { echo dba_exists($i, $db_file) ? "Y" : "N"; diff --git a/ext/dom/element.c b/ext/dom/element.c index f217ca2450d83..606a23f9cbf03 100644 --- a/ext/dom/element.c +++ b/ext/dom/element.c @@ -177,7 +177,7 @@ PHP_METHOD(domelement, __construct) RETURN_FALSE; } - /* Namespace logic is seperate and only when uri passed in to insure no BC breakage */ + /* Namespace logic is separate and only when uri passed in to insure no BC breakage */ if (uri_len > 0) { errorcode = dom_check_qname(name, &localname, &prefix, uri_len, name_len); if (errorcode == 0) { diff --git a/ext/dom/tests/DOMNode_removeChild_basic.phpt b/ext/dom/tests/DOMNode_removeChild_basic.phpt index 384eb47b5ecf2..fb0977488e625 100644 --- a/ext/dom/tests/DOMNode_removeChild_basic.phpt +++ b/ext/dom/tests/DOMNode_removeChild_basic.phpt @@ -39,7 +39,7 @@ $root = $dom->documentElement; $children = $root->childNodes; $len = $children->length; -echo "orignal has $len nodes\n"; +echo "original has $len nodes\n"; for ($index = $children->length - 1; $index >=0; $index--) { echo "node $index\n"; $current = $children->item($index); @@ -58,7 +58,7 @@ for ($index = 0; $index < $children->length; $index++) { } --EXPECTF-- -orignal has 5 nodes +original has 5 nodes node 4 Course: no title:DOMText ~string(1) " diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c index e4b42637663d4..141192c67fbee 100644 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c @@ -651,7 +651,7 @@ PHP_FUNCTION(enchant_broker_free_dict) /* }}} */ /* {{{ proto bool enchant_broker_dict_exists(resource broker, string tag) - Wether a dictionary exists or not. Using non-empty tag */ + Whether a dictionary exists or not. Using non-empty tag */ PHP_FUNCTION(enchant_broker_dict_exists) { zval *broker; diff --git a/ext/exif/tests/exif_tagname_variation1.phpt b/ext/exif/tests/exif_tagname_variation1.phpt index da899194c733f..0f9c1354205b6 100644 --- a/ext/exif/tests/exif_tagname_variation1.phpt +++ b/ext/exif/tests/exif_tagname_variation1.phpt @@ -78,7 +78,7 @@ $values = array ( // loop through each element of the array and check the working of exif_tagname() -// when $index arugment is supplied with different values +// when $index argument is supplied with different values echo "\n--- Testing exif_tagname() by supplying different values for 'index' argument ---\n"; $counter = 1; diff --git a/ext/fileinfo/tests/finfo_phpinfo_basic.phpt b/ext/fileinfo/tests/finfo_phpinfo_basic.phpt index c43ba4e298cf0..7d1b008d5a057 100644 --- a/ext/fileinfo/tests/finfo_phpinfo_basic.phpt +++ b/ext/fileinfo/tests/finfo_phpinfo_basic.phpt @@ -1,5 +1,5 @@ --TEST-- -Test finfo extention : loading into phpinfo() +Test finfo extension : loading into phpinfo() --SKIPIF-- --FILE-- diff --git a/ext/fileinfo/tests/magic b/ext/fileinfo/tests/magic index 5266dd0dc5516..27bde927e6709 100644 --- a/ext/fileinfo/tests/magic +++ b/ext/fileinfo/tests/magic @@ -4957,7 +4957,7 @@ >>>>0 ubelong =0 \b, next free block index %lu >>>>0 ubelong !0 \b, next free block index %lu >>>512 default x dBase IV DBT -# DBF file name without extention +# DBF file name without extension >>>>8 string >\0 \b of %-.8s.DBF # size of blocks ; not reliable 0x2020204C #>>>>4 ulelong =0 \b, blocks size %lu @@ -13205,7 +13205,7 @@ # they have their real name at offset 22 >>>>>22 string >\0 \b%-.5s >4 uleshort&0x8000 0x0000 -# 32 bit sector adressing ( > 32 MB) for block devices +# 32 bit sector addressing ( > 32 MB) for block devices >>4 uleshort&0x0002 0x0002 \b,32-bit sector- # support by driver functions 13h, 17h, 18h >4 uleshort&0x0040 0x0040 \b,IOCTL- @@ -17951,7 +17951,7 @@ # 00030 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 ................ # 00040 00 00 00 00 ff ff ff ff ff ff ff ff 02 00 00 00 ................ # -# GRR this test is still too general as it catches example adressen.dbt +# GRR this test is still too general as it catches example addressen.dbt 0 belong 0x03000000 >8 ubelong 0xec020000 VMS Alpha executable >>75264 string PK\003\004 \b, Info-ZIP SFX archive v5.12 w/decryption diff --git a/ext/gd/tests/imagecopyresampled_basic.phpt b/ext/gd/tests/imagecopyresampled_basic.phpt index a0454faf865e8..fd96ab6928439 100644 --- a/ext/gd/tests/imagecopyresampled_basic.phpt +++ b/ext/gd/tests/imagecopyresampled_basic.phpt @@ -35,9 +35,9 @@ imagefilledellipse($image_lge, 200, 150, 300, 200, $col_ellipse); imagepng($image_lge, $dest_lge); // Get new dimensions -$percent = 0.5; // new image 50% of orginal +$percent = 0.5; // new image 50% of original list($width, $height) = getimagesize($dest_lge); -echo "Size of orginal: width=". $width . " height=" . $height . "\n"; +echo "Size of original: width=". $width . " height=" . $height . "\n"; $new_width = $width * $percent; $new_height = $height * $percent; @@ -66,6 +66,6 @@ echo "Done\n"; ?> --EXPECT-- Simple test of imagecopyresampled() function -Size of orginal: width=400 height=300 +Size of original: width=400 height=300 Size of copy: width=200 height=150 Done diff --git a/ext/hash/tests/mhash_002.phpt b/ext/hash/tests/mhash_002.phpt index 7bcafd3896654..45cf09fb7718f 100644 --- a/ext/hash/tests/mhash_002.phpt +++ b/ext/hash/tests/mhash_002.phpt @@ -24,7 +24,7 @@ $supported_hash_al = array( "CRC32" => 4, "CRC32B" => 4, "ADLER32" => 4, -"NA_XYZ" => 0 /* verify that the algorythm works */ +"NA_XYZ" => 0 /* verify that the algorithm works */ ); $hc = mhash_count() + 1; diff --git a/ext/imap/tests/imap_include.inc b/ext/imap/tests/imap_include.inc index ed36239572fd4..b33a10e5e85f0 100644 --- a/ext/imap/tests/imap_include.inc +++ b/ext/imap/tests/imap_include.inc @@ -61,7 +61,7 @@ function displayOverviewFields($resp, $fields=null) { * @param string mailbox_suffix Suffix used to uniquely identify mailboxes * @param int message_count number of test msgs to be written to new mailbox * - * @return IMAP stream to new mailbox on sucesss; FALSE on failure + * @return IMAP stream to new mailbox on success; FALSE on failure */ function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = null, $msg_type = "simple"){ global $server, $default_mailbox, $username, $password; diff --git a/ext/interbase/tests/005.phpt b/ext/interbase/tests/005.phpt index 5b16ac2917679..c5167c132e464 100644 --- a/ext/interbase/tests/005.phpt +++ b/ext/interbase/tests/005.phpt @@ -18,7 +18,7 @@ InterBase: transactions /* Difference between default and other transactions: -default commited when you call ibase_close(). +default committed when you call ibase_close(). Other transaction doing rollback. If you not open default transaction with @@ -158,7 +158,7 @@ three transaction on default link ibase_free_result($res); - /* tr_4 IBASE_COMMITED + IBASE_REC_NO_VERSION + IBASE_NOWAIT */ + /* tr_4 IBASE_COMMITTED + IBASE_REC_NO_VERSION + IBASE_NOWAIT */ $res = ibase_query($tr_4, "select * from test5"); echo "three rows in fourth transaction with deadlock\n"; diff --git a/ext/intl/doc/Tutorial.txt b/ext/intl/doc/Tutorial.txt index 4a66dc18440a9..3bb31b00ec7d4 100644 --- a/ext/intl/doc/Tutorial.txt +++ b/ext/intl/doc/Tutorial.txt @@ -7,7 +7,7 @@ Examle of locales format: 'en_US', 'ru_UA', 'ua_UA' (see http://demo.icu-project 2. Collator::getDisplayName( $obj_locale, $disp_locale ). -Get name of the object for the desired Locale, in the desired langauge. Both arguments +Get name of the object for the desired Locale, in the desired language. Both arguments must be from getAvailableLocales method. @param string $obj_locale Locale to get display name for. diff --git a/ext/intl/doc/grapheme_api.php b/ext/intl/doc/grapheme_api.php index 465453fd324cd..e22d165cbbcda 100644 --- a/ext/intl/doc/grapheme_api.php +++ b/ext/intl/doc/grapheme_api.php @@ -98,7 +98,7 @@ function grapheme_substr($string, $start, $length = -1) {} * @param string $haystack The input string. * @param string $needle The string to look for. * @param [boolean] $before_needle If TRUE (the default is FALSE), grapheme_strstr() returns the part of the - haystack before the first occurence of the needle. + haystack before the first occurrence of the needle. * @return string Returns the portion of string, or FALSE if needle is not found. */ function grapheme_strstr($haystack, $needle, $before_needle = FALSE) {} @@ -109,7 +109,7 @@ function grapheme_strstr($haystack, $needle, $before_needle = FALSE) {} * @param string $haystack The input string. * @param string $needle The string to look for. * @param [boolean] $before_needle If TRUE (the default is FALSE), grapheme_strstr() returns the part of the - haystack before the first occurence of the needle. + haystack before the first occurrence of the needle. * @return string Returns the portion of string, or FALSE if needle is not found. */ function grapheme_stristr($haystack, $needle, $before_needle = FALSE) {} diff --git a/ext/intl/doc/msgfmt_api.php b/ext/intl/doc/msgfmt_api.php index e4d047b9790f8..3df6f0de11446 100644 --- a/ext/intl/doc/msgfmt_api.php +++ b/ext/intl/doc/msgfmt_api.php @@ -31,7 +31,7 @@ public static function create($locale, $pattern) {} /** * Format the message * @param array $args arguments to insert into the pattern string - * @return string the formatted string, or false if an error ocurred + * @return string the formatted string, or false if an error occurred */ public function format($args) {} @@ -124,7 +124,7 @@ function msgfmt_create($locale, $pattern) {} * Format the message * @param MessageFormatter $fmt The message formatter * @param array $args arguments to insert into the pattern string - * @return string the formatted string, or false if an error ocurred + * @return string the formatted string, or false if an error occurred */ function msgfmt_format($fmt, $args) {} diff --git a/ext/libxml/tests/bug61367-read.phpt b/ext/libxml/tests/bug61367-read.phpt index 94da3d8481917..75d0006a3f35e 100644 --- a/ext/libxml/tests/bug61367-read.phpt +++ b/ext/libxml/tests/bug61367-read.phpt @@ -8,7 +8,7 @@ error_reporting=E_ALL & ~E_NOTICE --FILE-- .c.obj in win32\Makefile. 2003/01/30: [impl] add -DNOT_RUBY to Makefile.in. - NOT_RUBY is refered in regint.h for escape double + NOT_RUBY is referred in regint.h for escape double including config.h. 2003/01/30: [impl] when string hasn't case ambiguity, don't compile to ignore case opcode. diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 145ee0c13fac9..607921ebb6b8f 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -648,7 +648,7 @@ _php_mb_regex_init_options(const char *parg, int narg, OnigOptionType *option, O /* }}} */ /* - * php funcions + * php functions */ /* {{{ proto string mb_regex_encoding([string encoding]) diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt index 1ea89d9beea78..4fe87f4c00951 100644 --- a/ext/mysqli/tests/bug34810.phpt +++ b/ext/mysqli/tests/bug34810.phpt @@ -16,7 +16,7 @@ class DbConnection { var_dump($link); $link = mysqli_init(); - /* @ is to supress 'Property access is not allowed yet' */ + /* @ is to suppress 'Property access is not allowed yet' */ @var_dump($link); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 724876e899d40..1d4e387d2317e 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -1455,7 +1455,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, list_fields)(MYSQLND_CONN_DATA * conn, const c } if (FAIL == result->m.read_result_metadata(result, conn TSRMLS_CC)) { - DBG_ERR("Error ocurred while reading metadata"); + DBG_ERR("Error occurred while reading metadata"); result->m.free_result(result, TRUE TSRMLS_CC); result = NULL; break; diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index b4725feb2b7e5..20d941e05b6f0 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -486,7 +486,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s mnd_efree(conn->current_result); conn->current_result = NULL; } - DBG_ERR("Error ocurred while reading metadata"); + DBG_ERR("Error occurred while reading metadata"); break; } @@ -498,7 +498,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s break; } if (FAIL == (ret = PACKET_READ(fields_eof, conn))) { - DBG_ERR("Error ocurred while reading the EOF packet"); + DBG_ERR("Error occurred while reading the EOF packet"); result->m.free_result_contents(result TSRMLS_CC); mnd_efree(result); if (!stmt) { diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index 00566b1b60137..c51d216f325ae 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -831,7 +831,7 @@ Fixed bug #36820 (Privileged connection with an Oracle password file fails) 2006-03-16 PHP Changed OCI8 code to use OCIServerVersion() instead of OCIPing(), which may crash Oracle server of version < 10.2 -Fixed bug #36235 (ocicolumnname returns false before a succesfull fetch) +Fixed bug #36235 (ocicolumnname returns false before a successfull fetch) Fixed bug #36096 (oci_result() returns garbage after oci_fetch() failed) Fixed bug #36055 (possible OCI8 crash in multithreaded environment) Fixed bug #36010 (Segfault when re-creating and re-executing statements with bound parameters) diff --git a/ext/oci8/tests/conn_attr.inc b/ext/oci8/tests/conn_attr.inc index 2c086b1892b4c..220e6882106b6 100644 --- a/ext/oci8/tests/conn_attr.inc +++ b/ext/oci8/tests/conn_attr.inc @@ -98,7 +98,7 @@ function set_attr($conn,$attr,$sufix) else if (!strcmp($attr,'CLIENT_IDENTIFIER')) $r = oci_set_client_identifier($conn,'ID00'.$sufix); else - echo "Pass one of the above four attibutes!!!\n"; + echo "Pass one of the above four attributes!!!\n"; if ($r) { echo "Value of $attr has been set successfully\n"; } diff --git a/ext/oci8/tests/conn_attr_4.phpt b/ext/oci8/tests/conn_attr_4.phpt index d15b7a38de837..4885f80b717a9 100644 --- a/ext/oci8/tests/conn_attr_4.phpt +++ b/ext/oci8/tests/conn_attr_4.phpt @@ -62,7 +62,7 @@ foreach($values_array as $val ) { oci_set_client_info($c1,$val); $r = oci_set_action($c1,$val); if ($r) { - echo "Values set succesfully to $val\n"; + echo "Values set successfully to $val\n"; foreach($attr_array as $attr) { get_attr($c1,$attr); } @@ -98,12 +98,12 @@ bool(true) The value of ACTION is ACTION1 Setting to different values -Values set succesfully to 1000 +Values set successfully to 1000 The value of MODULE is 1000 The value of ACTION is 1000 The value of CLIENT_INFO is 1000 The value of CLIENT_IDENTIFIER is 1000 -Values set succesfully to +Values set successfully to The value of MODULE is The value of ACTION is The value of CLIENT_INFO is diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h index 8251528e19c24..ca237c0537bf7 100644 --- a/ext/odbc/php_odbc_includes.h +++ b/ext/odbc/php_odbc_includes.h @@ -161,7 +161,7 @@ PHP_FUNCTION(solid_fetch_prev); #define UNIX /* * Extended Fetch in the Birdstep ODBC API is incapable of returning long varchar (memo) fields. - * So the following line has been commented-out to accomadate. - KNS + * So the following line has been commented-out to accommodate. - KNS * * #define HAVE_SQL_EXTENDED_FETCH 1 */ diff --git a/ext/openssl/tests/openssl.cnf b/ext/openssl/tests/openssl.cnf index 10e69076cff57..4ed40fdc8aa0b 100644 --- a/ext/openssl/tests/openssl.cnf +++ b/ext/openssl/tests/openssl.cnf @@ -3,7 +3,7 @@ default_bits = 1024 default_keyfile = privkey.pem distinguished_name = req_distinguished_name attributes = req_attributes -x509_extensions = v3_ca # The extentions to add to the self signed cert +x509_extensions = v3_ca # The extensions to add to the self signed cert string_mask = MASK:4294967295 diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index ff8a22e14f9b1..e9a72e3f3e421 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -274,7 +274,7 @@ static int php_openssl_sockop_close(php_stream *stream, int close_handle TSRMLS_ * Essentially, we are waiting for the socket to become writeable, which means * that all pending data has been sent. * We use a small timeout which should encourage the OS to send the data, - * but at the same time avoid hanging indefintely. + * but at the same time avoid hanging indefinitely. * */ do { n = php_pollfd_for_ms(sslsock->s.socket, POLLOUT, 500); diff --git a/ext/pcre/pcrelib/ChangeLog b/ext/pcre/pcrelib/ChangeLog index 1b016ecee521f..ed164fed0fc54 100644 --- a/ext/pcre/pcrelib/ChangeLog +++ b/ext/pcre/pcrelib/ChangeLog @@ -1751,7 +1751,7 @@ Version 7.7 07-May-08 containing () gave an internal compiling error instead of "reference to non-existent subpattern". Fortunately, when the pattern did exist, the compiled code was correct. (When scanning forwards to check for the - existencd of the subpattern, it was treating the data ']' as terminating + existence of the subpattern, it was treating the data ']' as terminating the class, so got the count wrong. When actually compiling, the reference was subsequently set up correctly.) diff --git a/ext/pcre/pcrelib/pcre_compile.c b/ext/pcre/pcrelib/pcre_compile.c index 5f0c8ed08734b..4997b3b1ecb49 100644 --- a/ext/pcre/pcrelib/pcre_compile.c +++ b/ext/pcre/pcrelib/pcre_compile.c @@ -8139,7 +8139,7 @@ if (code - codestart > length) errorcode = ERR23; #ifdef SUPPORT_VALGRIND /* If the estimated length exceeds the really used length, mark the extra -allocated memory as unadressable, so that any out-of-bound reads can be +allocated memory as unaddressable, so that any out-of-bound reads can be detected. */ VALGRIND_MAKE_MEM_NOACCESS(code, (length - (code - codestart)) * sizeof(pcre_uchar)); #endif diff --git a/ext/pcre/tests/preg_replace_basic.phpt b/ext/pcre/tests/preg_replace_basic.phpt index 33fb2d4a8a4ee..6962bce255f4b 100644 --- a/ext/pcre/tests/preg_replace_basic.phpt +++ b/ext/pcre/tests/preg_replace_basic.phpt @@ -11,7 +11,7 @@ var_dump($string); var_dump(preg_replace('<- This is a string$>', 'This shouldn\'t work', $string)); //tries to find '- This is a string' at the end of a string but can't so replaces nothing and prints the unchanged $string. var_dump(preg_replace('<[0-35-9]>', '4', $string)); //finds any number that's not 4 and replaces it with a 4 ('444444444') var_dump(preg_replace('<\b[hH]\w{2,4}>', 'Bonjour', $string)); //finds h or H at the beginning of a word followed by 2-4 characters and replaces it with Bonjour (i.e. Hello -> Bonjour) (was finding the 'his' in This and replacing it) -var_dump(preg_replace('<(\w)\s*-\s*(\w)>', '\\1. \\2', $string)); //finds dashes with an indefinate amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space +var_dump(preg_replace('<(\w)\s*-\s*(\w)>', '\\1. \\2', $string)); //finds dashes with an indefinite amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', '\\1 at \\2 dot \\3 dot \\4', 'josmessa@uk.ibm.com')); //finds the e-mail address and replaces the @ and . with "at" and "dot" (uses backreferences) ('josmessa at uk dot ibm dot com') ?> diff --git a/ext/pcre/tests/preg_replace_edit_basic.phpt b/ext/pcre/tests/preg_replace_edit_basic.phpt index 97350e756e07f..556b48b8c1d77 100644 --- a/ext/pcre/tests/preg_replace_edit_basic.phpt +++ b/ext/pcre/tests/preg_replace_edit_basic.phpt @@ -24,7 +24,7 @@ var_dump(preg_replace('<\b[hH]\w{2,4}>', 'Bonjour', $string)); //finds h or H at the beginning of a word followed by 2-4 characters and replaces it with Bonjour (i.e. Hello -> Bonjour) (was finding the 'his' in This and replacing it) var_dump(preg_replace('<(\w)\s*-\s*(\w)>', - '\\1. \\2', $string)); //finds dashes with an indefinate amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space + '\\1. \\2', $string)); //finds dashes with an indefinite amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', '\\1 at \\2 dot \\3 dot \\4', 'josmessa@uk.ibm.com')); //finds the e-mail address and replaces the @ and . with "at" and "dot" (uses backreferences) ('josmessa at uk dot ibm dot com') diff --git a/ext/pcre/tests/preg_split_basic.phpt b/ext/pcre/tests/preg_split_basic.phpt index e94a94f62e78f..5d23ce6df1310 100644 --- a/ext/pcre/tests/preg_split_basic.phpt +++ b/ext/pcre/tests/preg_split_basic.phpt @@ -7,7 +7,7 @@ Test preg_split() function : basic functionality * Function is implemented in ext/pcre/php_pcre.c */ $string = 'this is a_list: value1, Test__, string; Hello, world!_(parentheses)'; -var_dump(preg_split('/[:,;\(\)]/', $string, -1, PREG_SPLIT_NO_EMPTY)); //parts of $string seperated by : , ; ( or ) are put into an array. +var_dump(preg_split('/[:,;\(\)]/', $string, -1, PREG_SPLIT_NO_EMPTY)); //parts of $string separated by : , ; ( or ) are put into an array. var_dump(preg_split('/:\s*(\w*,*\s*)+;/', $string)); //all text between : and ; is removed var_dump(preg_split('/(\(|\))/', $string, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY)); //all text before (parentheses) is put into first element, ( into second, "parentheses" into third and ) into fourth. var_dump(preg_split('/NAME/i', $string)); //tries to find NAME regardless of case in $string (can't split it so just returns how string as first element) diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h index f38e7b5ec917a..c757dbf1e531c 100644 --- a/ext/pdo/php_pdo_driver.h +++ b/ext/pdo/php_pdo_driver.h @@ -469,7 +469,7 @@ struct _pdo_dbh_t { /* when set, convert int/floats to strings */ unsigned stringify:1; - /* the sum of the number of bits here and the bit fields preceeding should + /* the sum of the number of bits here and the bit fields preceding should * equal 32 */ unsigned _reserved_flags:21; diff --git a/ext/pgsql/README b/ext/pgsql/README index 2b4c412338d4b..785b4f034b35f 100644 --- a/ext/pgsql/README +++ b/ext/pgsql/README @@ -35,7 +35,7 @@ names. Older names will become aliases of new functions for backward compatibility. -Manual will be updated when this change is commited to CVS source. +Manual will be updated when this change is committed to CVS source. ==== Configure Option Notes ==== You cannot specify PostgreSQL source directly to build PostgreSQL diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c index 65193726def92..00cb92ff13362 100644 --- a/ext/phar/func_interceptors.c +++ b/ext/phar/func_interceptors.c @@ -733,7 +733,7 @@ static void phar_file_stat(const char *filename, php_stat_len filename_length, i PHAR_G(cwd_len) = save_len; efree(entry); efree(arch); - /* Error Occured */ + /* Error Occurred */ if (!IS_EXISTS_CHECK(type)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "%sstat failed for %s", IS_LINK_OPERATION(type) ? "L" : "", filename); } diff --git a/ext/phar/tests/files/openssl.cnf b/ext/phar/tests/files/openssl.cnf index 10e69076cff57..4ed40fdc8aa0b 100644 --- a/ext/phar/tests/files/openssl.cnf +++ b/ext/phar/tests/files/openssl.cnf @@ -3,7 +3,7 @@ default_bits = 1024 default_keyfile = privkey.pem distinguished_name = req_distinguished_name attributes = req_attributes -x509_extensions = v3_ca # The extentions to add to the self signed cert +x509_extensions = v3_ca # The extensions to add to the self signed cert string_mask = MASK:4294967295 diff --git a/ext/posix/config.m4 b/ext/posix/config.m4 index 83ead2e46a979..82b80ce972c9b 100644 --- a/ext/posix/config.m4 +++ b/ext/posix/config.m4 @@ -45,6 +45,6 @@ int main(int argc, char *argv[]) ]) ]) if test "$ac_cv_have_utsname_domainname" = yes; then - AC_DEFINE(HAVE_UTSNAME_DOMAINNAME, 1, [Wether struct utsname has domainname]) + AC_DEFINE(HAVE_UTSNAME_DOMAINNAME, 1, [Whether struct utsname has domainname]) fi fi diff --git a/ext/shmop/README b/ext/shmop/README index 5ec15861b8489..a8ea03af912fd 100644 --- a/ext/shmop/README +++ b/ext/shmop/README @@ -4,12 +4,12 @@ Shared Memory Operations Extension to PHP While developing a search deamon we needed a php based front end to communicate the deamon via SHM. PHP already had a shared memory - extention (sysvshm) written by Christian Cartus , - unfortunatly this extention was designed with PHP only in mind and + extension (sysvshm) written by Christian Cartus , + unfortunately this extension was designed with PHP only in mind and offers high level features which are extremly bothersome for basic SHM we had in mind. After spending a day trying to reverse engineer and figure out the format of sysvshm we decided that it would be much easier to - add our own extention to php for simple SHM operations, we were right :)). + add our own extension to php for simple SHM operations, we were right :)). the functions are: diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 47e2d43f5aef2..186aeb5cdd17d 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -719,7 +719,7 @@ static void php_snmp_internal(INTERNAL_FUNCTION_PARAMETERS, int st, zval *snmpval = NULL; int snmp_errno; - /* we start with retval=FALSE. If any actual data is aquired, retval will be set to appropriate type */ + /* we start with retval=FALSE. If any actual data is acquired, retval will be set to appropriate type */ RETVAL_FALSE; /* reset errno and errstr */ @@ -1871,7 +1871,7 @@ PHP_METHOD(snmp, close) /* }}} */ /* {{{ proto mixed SNMP::get(mixed object_id [, bool preserve_keys]) - Fetch a SNMP object returing scalar for single OID and array of oid->value pairs for multi OID request */ + Fetch a SNMP object returning scalar for single OID and array of oid->value pairs for multi OID request */ PHP_METHOD(snmp, get) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GET, (-1)); @@ -1879,7 +1879,7 @@ PHP_METHOD(snmp, get) /* }}} */ /* {{{ proto mixed SNMP::getnext(mixed object_id) - Fetch a SNMP object returing scalar for single OID and array of oid->value pairs for multi OID request */ + Fetch a SNMP object returning scalar for single OID and array of oid->value pairs for multi OID request */ PHP_METHOD(snmp, getnext) { php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GETNEXT, (-1)); diff --git a/ext/soap/TODO b/ext/soap/TODO index ad0b11c94833a..9e6784f6f4377 100644 --- a/ext/soap/TODO +++ b/ext/soap/TODO @@ -41,7 +41,7 @@ Encoding ? support for "nillable" and "nil" ? default values of ? provide schema 1999/2001 support??? -? make internal refrences for soap encoding (use seralization logic)??? +? make internal references for soap encoding (use serialization logic)??? ? provide user space overriding of serialization certin objects and types??? WSDL diff --git a/ext/soap/TODO.old b/ext/soap/TODO.old index 59deb4b9dc091..b219c61f8a33a 100644 --- a/ext/soap/TODO.old +++ b/ext/soap/TODO.old @@ -2,13 +2,13 @@ TODO: make sure soap 1.1 and 1.2 is supported fully Better WSDL support Client and server (how much validation is needed here?) UDDI?? -make internal refrences for soap encoding (use seralization logic) +make internal references for soap encoding (use serialization logic) add ini option for always soap_error_handler provide user space overriding of serialization certin objects and types serialization in general needs to be polished/finished... all xsd types look to see if php-soap will work with out always_populate_raw_post_data on see if client will work with ssl.. should be eaiser with php_streams -work on soap seralizer (php serialization) +work on soap serializer (php serialization) -work on a soap-service 'regiestry' and 'proxy' (apache soap style) -convert all string mainpulation to use smart_str make the 'soap' packet abstract.. maybe incorperate xml-rpc diff --git a/ext/soap/interop/client_round2_params.php b/ext/soap/interop/client_round2_params.php index f0987a170278c..e0b2c0e82da5d 100644 --- a/ext/soap/interop/client_round2_params.php +++ b/ext/soap/interop/client_round2_params.php @@ -486,7 +486,7 @@ function SOAPStruct($s, $i, $f) { $soap_tests['GroupC'][] = $test; // echoMeStringRequest with endpoint header destination, must understand, -// invalid namespace, should recieve a fault +// invalid namespace, should receive a fault $test = new SOAP_Test('echoVoid(echoMeStringRequest invalid namespace)', NULL); $test->headers[] = new SoapHeader('http://unknown.org/echoheader/','echoMeStringRequest', 'hello world', 1, SOAP_ACTOR_NEXT); $test->headers_expect = array(); diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index 7a109c1966226..5af308c180239 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -1222,7 +1222,7 @@ int make_http_soap_request(zval *this_ptr, zval *err; MAKE_STD_ZVAL(err); ZVAL_STRINGL(err, http_body, http_body_size, 1); - add_soap_fault(this_ptr, "HTTP", "Didn't recieve an xml document", NULL, err TSRMLS_CC); + add_soap_fault(this_ptr, "HTTP", "Didn't receive an xml document", NULL, err TSRMLS_CC); efree(content_type); efree(http_headers); efree(http_body); diff --git a/ext/soap/soap.c b/ext/soap/soap.c index ba9455e134f87..8a41ff4e4fdac 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -1675,7 +1675,7 @@ PHP_METHOD(SoapServer, handle) } } #endif - /* If new session or something wierd happned */ + /* If new session or something weird happned */ if (soap_obj == NULL) { zval *tmp_soap; diff --git a/ext/soap/tests/bugs/bug27742.wsdl b/ext/soap/tests/bugs/bug27742.wsdl index f38d911852335..7f1514acbf375 100644 --- a/ext/soap/tests/bugs/bug27742.wsdl +++ b/ext/soap/tests/bugs/bug27742.wsdl @@ -5,7 +5,7 @@ - ISO 8601 pattern used to denote program durations. Year, month and day are not relevent in our context and are omitted. + ISO 8601 pattern used to denote program durations. Year, month and day are not relevant in our context and are omitted. @@ -484,7 +484,7 @@ - Date untill which the mapping is valid, within the validity period of the whole XTVD document. @IMPORTANT : The change will occur at midnight. + Date until which the mapping is valid, within the validity period of the whole XTVD document. @IMPORTANT : The change will occur at midnight. diff --git a/ext/spl/internal/cachingiterator.inc b/ext/spl/internal/cachingiterator.inc index 33258ab954b6d..4d4bf8dbff879 100644 --- a/ext/spl/internal/cachingiterator.inc +++ b/ext/spl/internal/cachingiterator.inc @@ -23,7 +23,7 @@ * flag CALL_TOSTRING to do the conversion when the actual element * is being fetched. Otherwise the conversion would happen with the * already changed iterator. If you do not need this then it you should - * omit this flag because it costs unneccessary work and time. + * omit this flag because it costs unnecessary work and time. */ class CachingIterator implements OuterIterator { diff --git a/ext/spl/tests/iterator_031.phpt b/ext/spl/tests/iterator_031.phpt index 40342f4bb47e4..8bd3ca7c54cfc 100644 --- a/ext/spl/tests/iterator_031.phpt +++ b/ext/spl/tests/iterator_031.phpt @@ -1,5 +1,5 @@ --TEST-- -SPL: AppendIterator::append() rewinds when neccessary +SPL: AppendIterator::append() rewinds when necessary --FILE-- ===DONE=== @@ -77,7 +77,7 @@ int(4) Error: Argument 3 passed to iterator_apply() must be of the type array, integer given Error: iterator_apply() expects parameter 3 to be array, integer given NULL -Error: iterator_apply() expects parameter 2 to be a valid callback, function 'non_existing_functon' not found or invalid function name +Error: iterator_apply() expects parameter 2 to be a valid callback, function 'non_existing_function' not found or invalid function name NULL Error: iterator_apply() expects at most 3 parameters, 4 given NULL diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index 2bcd2409a9e8c..784be51344b17 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -361,7 +361,7 @@ ** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2. ** 0 means mutexes are permanently disable and the library is never ** threadsafe. 1 means the library is serialized which is the highest -** level of threadsafety. 2 means the libary is multithreaded - multiple +** level of threadsafety. 2 means the library is multithreaded - multiple ** threads can use SQLite as long as no two threads try to use the same ** database connection at the same time. ** @@ -19267,7 +19267,7 @@ SQLITE_PRIVATE void sqlite3VXPrintf( } if( xtype==etGENERIC && precision>0 ) precision--; #if 0 - /* Rounding works like BSD when the constant 0.4999 is used. Wierd! */ + /* Rounding works like BSD when the constant 0.4999 is used. Weird! */ for(idx=precision, rounder=0.4999; idx>0; idx--, rounder*=0.1); #else /* It makes more sense to use 0.5 */ @@ -23962,7 +23962,7 @@ static int os2Delete( } /* -** Check the existance and status of a file. +** Check the existence and status of a file. */ static int os2Access( sqlite3_vfs *pVfs, /* Not used on os2 */ @@ -26315,7 +26315,7 @@ static int nolockClose(sqlite3_file *id) { /****************************************************************************** ************************* Begin dot-file Locking ****************************** ** -** The dotfile locking implementation uses the existance of separate lock +** The dotfile locking implementation uses the existence of separate lock ** files in order to control access to the database. This works on just ** about every filesystem imaginable. But there are serious downsides: ** @@ -26330,7 +26330,7 @@ static int nolockClose(sqlite3_file *id) { ** ** Dotfile locking works by creating a file in the same directory as the ** database and with the same name but with a ".lock" extension added. -** The existance of a lock file implies an EXCLUSIVE lock. All other lock +** The existence of a lock file implies an EXCLUSIVE lock. All other lock ** types (SHARED, RESERVED, PENDING) are mapped into EXCLUSIVE. */ @@ -29637,7 +29637,7 @@ static int unixDelete( } /* -** Test the existance of or access permissions of file zPath. The +** Test the existence of or access permissions of file zPath. The ** test performed depends on the value of flags: ** ** SQLITE_ACCESS_EXISTS: Return 1 if the file exists @@ -33788,7 +33788,7 @@ static int winDelete( } /* -** Check the existance and status of a file. +** Check the existence and status of a file. */ static int winAccess( sqlite3_vfs *pVfs, /* Not used on win32 */ @@ -34345,7 +34345,7 @@ SQLITE_API int sqlite3_os_end(void){ /* ** A bitmap is an instance of the following structure. ** -** This bitmap records the existance of zero or more bits +** This bitmap records the existence of zero or more bits ** with values between 1 and iSize, inclusive. ** ** There are three possible representations of the bitmap. @@ -35828,7 +35828,7 @@ static sqlite3_pcache *pcache1Create(int szPage, int bPurgeable){ int sz; /* Bytes of memory required to allocate the new cache */ /* - ** The seperateCache variable is true if each PCache has its own private + ** The separateCache variable is true if each PCache has its own private ** PGroup. In other words, separateCache is true for mode (1) where no ** mutexing is required. ** @@ -41734,7 +41734,7 @@ static void pagerUnlockIfUnused(Pager *pPager){ ** page is initialized to all zeros. ** ** If noContent is true, it means that we do not care about the contents -** of the page. This occurs in two seperate scenarios: +** of the page. This occurs in two separate scenarios: ** ** a) When reading a free-list leaf page from the database, and ** @@ -48700,7 +48700,7 @@ static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){ }else if( gap+2<=top ){ /* Search the freelist looking for a free slot big enough to satisfy ** the request. The allocation is made from the first free slot in - ** the list that is large enough to accomadate it. + ** the list that is large enough to accommodate it. */ int pc, addr; for(addr=hdr+1; (pc = get2byte(&data[addr]))>0; addr=pc){ @@ -50520,7 +50520,7 @@ SQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *p){ /* ** This routine is called prior to sqlite3PagerCommit when a transaction -** is commited for an auto-vacuum database. +** is committed for an auto-vacuum database. ** ** If SQLITE_OK is returned, then *pnTrunc is set to the number of pages ** the database file should be truncated to during the commit process. @@ -52264,7 +52264,7 @@ SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){ ** which in turn can make database access faster. ** ** If the "exact" parameter is not 0, and the page-number nearby exists -** anywhere on the free-list, then it is guarenteed to be returned. This +** anywhere on the free-list, then it is guaranteed to be returned. This ** is only used by auto-vacuum databases when allocating a new table. */ static int allocateBtreePage( @@ -58372,7 +58372,7 @@ SQLITE_PRIVATE void sqlite3VdbeNoopComment(Vdbe *p, const char *zFormat, ...){ ** by running with Valgrind. ** ** About the #ifdef SQLITE_OMIT_TRACE: Normally, this routine is never called -** unless p->nOp>0. This is because in the absense of SQLITE_OMIT_TRACE, +** unless p->nOp>0. This is because in the absence of SQLITE_OMIT_TRACE, ** an OP_Trace instruction is always inserted by sqlite3VdbeGet() as soon as ** a new VDBE is created. So we are free to set addr to p->nOp-1 without ** having to double-check to make sure that the result is non-negative. But @@ -59551,7 +59551,7 @@ static void invalidateCursorsOnModifiedBtrees(sqlite3 *db){ ** close it now. Argument eOp must be either SAVEPOINT_ROLLBACK or ** SAVEPOINT_RELEASE. If it is SAVEPOINT_ROLLBACK, then the statement ** transaction is rolled back. If eOp is SAVEPOINT_RELEASE, then the -** statement transaction is commtted. +** statement transaction is committed. ** ** If an IO error occurs, an SQLITE_IOERR_XXX error code is returned. ** Otherwise SQLITE_OK. @@ -60076,7 +60076,7 @@ SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(VdbeCursor *p){ ** the blob of data that it corresponds to. In a table record, all serial ** types are stored at the start of the record, and the blobs of data at ** the end. Hence these functions allow the caller to handle the -** serial-type and data blob seperately. +** serial-type and data blob separately. ** ** The following table describes the various storage classes for data: ** @@ -65590,7 +65590,7 @@ case OP_AutoCommit: { ** other process can start another write transaction while this transaction is ** underway. Starting a write transaction also creates a rollback journal. A ** write transaction must be started before any changes can be made to the -** database. If P2 is 2 or greater then an EXCLUSIVE lock is also obtained +** database. If P2 is 2 or greater than an EXCLUSIVE lock is also obtained ** on the file. ** ** If a write-transaction is started and the Vdbe.usesStmtJournal flag is @@ -72784,7 +72784,7 @@ SQLITE_PRIVATE int sqlite3FindInIndex(Parse *pParse, Expr *pX, int *prNotFound){ ** ** If rMayHaveNull is zero, that means that the subquery is being used ** for membership testing only. There is no need to initialize any -** registers to indicate the presense or absence of NULLs on the RHS. +** registers to indicate the presence or absence of NULLs on the RHS. ** ** For a SELECT or EXISTS operator, return the register that holds the ** result. For IN operators or if an error occurs, the return value is 0. @@ -74392,7 +74392,7 @@ SQLITE_PRIVATE void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int int r1, r2; assert( jumpIfNull==SQLITE_JUMPIFNULL || jumpIfNull==0 ); - if( NEVER(v==0) ) return; /* Existance of VDBE checked by caller */ + if( NEVER(v==0) ) return; /* Existence of VDBE checked by caller */ if( NEVER(pExpr==0) ) return; /* No way this can happen */ op = pExpr->op; switch( op ){ @@ -74512,7 +74512,7 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int int r1, r2; assert( jumpIfNull==SQLITE_JUMPIFNULL || jumpIfNull==0 ); - if( NEVER(v==0) ) return; /* Existance of VDBE checked by caller */ + if( NEVER(v==0) ) return; /* Existence of VDBE checked by caller */ if( pExpr==0 ) return; /* The value of pExpr->op and op are related as follows: @@ -79452,7 +79452,7 @@ SQLITE_PRIVATE void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView, /* Drop all SQLITE_MASTER table and index entries that refer to the ** table. The program name loops through the master table and deletes ** every row that refers to a table of the same name as the one being - ** dropped. Triggers are handled seperately because a trigger can be + ** dropped. Triggers are handled separately because a trigger can be ** created in the temp database that refers to a table in another ** database. */ @@ -82374,7 +82374,7 @@ static void absFunc(sqlite3_context *context, int argc, sqlite3_value **argv){ ** ** If p1 is negative, then we begin abs(p1) from the end of x[]. ** -** If p2 is negative, return the p2 characters preceeding p1. +** If p2 is negative, return the p2 characters preceding p1. */ static void substrFunc( sqlite3_context *context, @@ -83172,7 +83172,7 @@ static void zeroblobFunc( /* ** The replace() function. Three arguments are all strings: call ** them A, B, and C. The result is also a string which is derived -** from A by replacing every occurance of B with C. The match +** from A by replacing every occurrence of B with C. The match ** must be exact. Collating sequences are not used. */ static void replaceFunc( @@ -90574,7 +90574,7 @@ SQLITE_PRIVATE void sqlite3SelectDelete(sqlite3 *db, Select *p){ } /* -** Given 1 to 3 identifiers preceeding the JOIN keyword, determine the +** Given 1 to 3 identifiers preceding the JOIN keyword, determine the ** type of join. Return an integer constant that expresses that type ** in terms of the following bit values: ** @@ -91892,7 +91892,7 @@ static void computeLimitRegisters(Parse *pParse, Select *p, int iBreak){ /* ** "LIMIT -1" always shows all rows. There is some - ** contraversy about what the correct behavior should be. + ** controversy about what the correct behavior should be. ** The current implementation interprets "LIMIT 0" to mean ** no rows. */ @@ -94252,7 +94252,7 @@ SQLITE_PRIVATE int sqlite3Select( if( pSub==0 || pItem->isPopulated ) continue; /* Increment Parse.nHeight by the height of the largest expression - ** tree refered to by this, the parent select. The child select + ** tree referred to by this, the parent select. The child select ** may contain expression trees of at most ** (SQLITE_MAX_EXPR_DEPTH-Parse.nHeight) height. This is a bit ** more conservative than necessary, but much easier than enforcing @@ -99313,7 +99313,7 @@ static void exprAnalyzeOrTerm( } if( (chngToIN & getMask(pMaskSet, pOrTerm->leftCursor))==0 ){ /* This term must be of the form t1.a==t2.b where t2 is in the - ** chngToIN set but t1 is not. This term will be either preceeded + ** chngToIN set but t1 is not. This term will be either preceded ** or follwed by an inverted copy (t2.b==t1.a). Skip this term ** and use its inversion. */ testcase( pOrTerm->wtFlags & TERM_COPIED ); @@ -102953,7 +102953,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( ** (1) The table must not depend on other tables that have not ** yet run. ** - ** (2) A full-table-scan plan cannot supercede indexed plan unless + ** (2) A full-table-scan plan cannot supersede indexed plan unless ** the full-table-scan is an "optimal" plan as defined above. ** ** (3) All tables have an INDEXED BY clause or this table lacks an @@ -107619,7 +107619,7 @@ SQLITE_PRIVATE const char sqlite3IsEbcdicIdChar[]; ** a statement. ** ** (4) CREATE The keyword CREATE has been seen at the beginning of a -** statement, possibly preceeded by EXPLAIN and/or followed by +** statement, possibly preceded by EXPLAIN and/or followed by ** TEMP or TEMPORARY ** ** (5) TRIGGER We are in the middle of a trigger definition that must be @@ -108525,7 +108525,7 @@ static int binCollFunc( /* ** Another built-in collating sequence: NOCASE. ** -** This collating sequence is intended to be used for "case independant +** This collating sequence is intended to be used for "case independent ** comparison". SQLite's knowledge of upper and lower case equivalents ** extends only to the 26 characters used in the English language. ** @@ -116368,7 +116368,7 @@ SQLITE_PRIVATE int sqlite3Fts3EvalPhraseStats( ** of the current row. ** ** More specifically, the returned buffer contains 1 varint for each -** occurence of the phrase in the column, stored using the normal (delta+2) +** occurrence of the phrase in the column, stored using the normal (delta+2) ** compression and is terminated by either an 0x01 or 0x00 byte. For example, ** if the requested column contains "a b X c d X X" and the position-list ** for 'X' is requested, the buffer returned may contain: @@ -118508,7 +118508,7 @@ static int star_oh(const char *z){ /* ** If the word ends with zFrom and xCond() is true for the stem -** of the word that preceeds the zFrom ending, then change the +** of the word that preceds the zFrom ending, then change the ** ending to zTo. ** ** The input word *pz and zFrom are both in reverse order. zTo @@ -123270,9 +123270,9 @@ static int fts3SnippetFindPositions(Fts3Expr *pExpr, int iPhrase, void *ctx){ ** is the snippet with the highest score, where scores are calculated ** by adding: ** -** (a) +1 point for each occurence of a matchable phrase in the snippet. +** (a) +1 point for each occurrence of a matchable phrase in the snippet. ** -** (b) +1000 points for the first occurence of each matchable phrase in +** (b) +1000 points for the first occurrence of each matchable phrase in ** the snippet for which the corresponding mCovered bit is not set. ** ** The selected snippet parameters are stored in structure *pFragment before @@ -123373,7 +123373,7 @@ static int fts3StringAppend( } /* If there is insufficient space allocated at StrBuffer.z, use realloc() - ** to grow the buffer until so that it is big enough to accomadate the + ** to grow the buffer until so that it is big enough to accommodate the ** appended data. */ if( pStr->n+nAppend+1>=pStr->nAlloc ){ diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index 8e88a8508095c..2713d23f1d826 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -904,7 +904,7 @@ PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int typ } if (php_stream_stat_path_ex((char *)filename, flags, &ssb, NULL)) { - /* Error Occured */ + /* Error Occurred */ if (!IS_EXISTS_CHECK(type)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "%sstat failed for %s", IS_LINK_OPERATION(type) ? "L" : "", filename); } diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index 373293935835d..86975d7f5b20b 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -440,7 +440,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch if (strchr(mode, 'a')) { read_write = 3; /* Open for Appending */ } else { - read_write = 2; /* Open for writting */ + read_write = 2; /* Open for writing */ } } if (!read_write) { @@ -500,7 +500,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch } if (result <= 299 && result >= 200) { if (allow_overwrite) { - /* Context permits overwritting file, + /* Context permits overwriting file, so we just delete whatever's there in preparation */ php_stream_printf(stream TSRMLS_CC, "DELE %s\r\n", resource->path); result = GET_FTP_RESULT(stream); diff --git a/ext/standard/image.c b/ext/standard/image.c index 4984e4064a3ea..b3dade4a75609 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -606,7 +606,7 @@ static struct gfxinfo *php_handle_jpc(php_stream * stream TSRMLS_DC) /* JPEG 2000 components can be vastly different from one another. Each component can be sampled at a different resolution, use - a different colour space, have a seperate colour depth, and + a different colour space, have a separate colour depth, and be compressed totally differently! This makes giving a single "bit depth" answer somewhat problematic. For this implementation we'll use the highest depth encountered. */ diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 209cb7f9b2249..f487763b9e02b 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -1591,7 +1591,7 @@ PHP_FUNCTION(stream_is_local) /* }}} */ /* {{{ proto bool stream_supports_lock(resource stream) - Tells wether the stream supports locking through flock(). */ + Tells whether the stream supports locking through flock(). */ PHP_FUNCTION(stream_supports_lock) { php_stream *stream; diff --git a/ext/standard/tests/array/array_combine_variation3.phpt b/ext/standard/tests/array/array_combine_variation3.phpt index 03de632905cff..1381fe0f4c92c 100644 --- a/ext/standard/tests/array/array_combine_variation3.phpt +++ b/ext/standard/tests/array/array_combine_variation3.phpt @@ -29,7 +29,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = <<arr)); //found, key is in member array -/* error condition, first arguemnt as object */ +/* error condition, first argument as object */ var_dump( array_key_exists($key_check_obj, $key_check_obj) ); echo "Done\n"; ?> diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt index 722388a015156..76bf913918d8f 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt @@ -30,7 +30,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = << diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt index e4cbaf8d2cec6..fa13242a08cea 100644 --- a/ext/standard/tests/array/krsort_variation1.phpt +++ b/ext/standard/tests/array/krsort_variation1.phpt @@ -72,7 +72,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of krsort() -// when $array arugment is supplied with different values from $unexpected_values +// when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing krsort() by supplying different unexpected values for 'array' argument --\n"; echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt index 13762024705eb..d193589de448b 100644 --- a/ext/standard/tests/array/krsort_variation2.phpt +++ b/ext/standard/tests/array/krsort_variation2.phpt @@ -69,7 +69,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of krsort() -// when 'sort_flags' arugment is supplied with different values +// when 'sort_flags' argument is supplied with different values echo "\n-- Testing krsort() by supplying different unexpected values for 'sort_flags' argument --\n"; $counter = 1; diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt index d8c037fa95c68..37a35d1c01128 100644 --- a/ext/standard/tests/array/ksort_variation1.phpt +++ b/ext/standard/tests/array/ksort_variation1.phpt @@ -72,7 +72,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of ksort() -// when $array arugment is supplied with different values from $unexpected_values +// when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing ksort() by supplying different unexpected values for 'array' argument --\n"; echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt index 4969844e759d2..102c1c1eb650e 100644 --- a/ext/standard/tests/array/ksort_variation2.phpt +++ b/ext/standard/tests/array/ksort_variation2.phpt @@ -69,7 +69,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of ksort() -// when 'sort_flags' arugment is supplied with different values +// when 'sort_flags' argument is supplied with different values echo "\n-- Testing ksort() by supplying different unexpected values for 'sort_flags' argument --\n"; $counter = 1; diff --git a/ext/standard/tests/array/sizeof_basic2.phpt b/ext/standard/tests/array/sizeof_basic2.phpt index a2ab2eedfda1c..b56682c31a4a6 100644 --- a/ext/standard/tests/array/sizeof_basic2.phpt +++ b/ext/standard/tests/array/sizeof_basic2.phpt @@ -19,7 +19,7 @@ echo "*** Testing sizeof() : basic functionality ***\n"; $int_array = array(1, 2, 3, 4); $string_array = array("Saffron", "White", "Green"); -$indexed_array = array("Agression" => "Saffron", "Peace" => "White", "Growth" => "Green"); +$indexed_array = array("Aggression" => "Saffron", "Peace" => "White", "Growth" => "Green"); $mixed_array = array(1, 2, "Aggression" => "Saffron", 10 => "Ten", "Ten" => 10); echo "-- Testing sizeof() with integer array in default, COUNT_NORMAL, COUNT_RECURSIVE modes --\n"; diff --git a/ext/standard/tests/array/sizeof_variation4.phpt b/ext/standard/tests/array/sizeof_variation4.phpt index a2462757d6d7d..cb8fecc822d7f 100644 --- a/ext/standard/tests/array/sizeof_variation4.phpt +++ b/ext/standard/tests/array/sizeof_variation4.phpt @@ -54,7 +54,7 @@ $values = array ( /* 20 */ $fp ); -// loop through the each element of the $values array for 'var' arugment +// loop through the each element of the $values array for 'var' argument // and check the functionality of sizeof() $counter = 1; foreach($values as $value) diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt index f6991bdf67bad..9243de08e4757 100644 --- a/ext/standard/tests/array/sort_variation1.phpt +++ b/ext/standard/tests/array/sort_variation1.phpt @@ -73,7 +73,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of sort() -// when $array arugment is supplied with different values from $unexpected_values +// when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing sort() by supplying different unexpected values for 'array' argument --\n"; echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; diff --git a/ext/standard/tests/array/sort_variation2.phpt b/ext/standard/tests/array/sort_variation2.phpt index 7cb8ed642a83a..af3deba4b9854 100644 --- a/ext/standard/tests/array/sort_variation2.phpt +++ b/ext/standard/tests/array/sort_variation2.phpt @@ -69,7 +69,7 @@ $unexpected_values = array( ); // loop though each element of the array and check the working of sort() -// when $flag arugment is supplied with different values +// when $flag argument is supplied with different values echo "\n-- Testing sort() by supplying different unexpected values for 'flag' argument --\n"; $counter = 1; diff --git a/ext/standard/tests/array/uasort_error.phpt b/ext/standard/tests/array/uasort_error.phpt index 820ab58478faa..cc2dd3a217532 100644 --- a/ext/standard/tests/array/uasort_error.phpt +++ b/ext/standard/tests/array/uasort_error.phpt @@ -50,7 +50,7 @@ var_dump( uasort($array_arg) ); echo "-- Testing uasort() function with non-existent compare function --\n"; var_dump( uasort($array_arg, 'non_existent') ); -// With non existent comparison function and extra arguemnt +// With non existent comparison function and extra argument echo "-- Testing uasort() function with non-existent compare function and extra argument --\n"; var_dump( uasort($array_arg, 'non_existent', $extra_arg) ); diff --git a/ext/standard/tests/array/usort_error2.phpt b/ext/standard/tests/array/usort_error2.phpt index 308199fc1f572..7bf0f659e0365 100644 --- a/ext/standard/tests/array/usort_error2.phpt +++ b/ext/standard/tests/array/usort_error2.phpt @@ -36,7 +36,7 @@ $extra_arg = 10; echo "\n-- Testing usort() function with non-existent compare function --\n"; var_dump( usort($array_arg, 'non_existent') ); -// With non existent comparison function and extra arguemnt +// With non existent comparison function and extra argument echo "\n-- Testing usort() function with non-existent compare function and extra argument --\n"; var_dump( usort($array_arg, 'non_existent', $extra_arg) ); ?> diff --git a/ext/standard/tests/file/007_variation10.phpt b/ext/standard/tests/file/007_variation10.phpt index c9f3e01cffa2a..2981ef7d4cac7 100644 --- a/ext/standard/tests/file/007_variation10.phpt +++ b/ext/standard/tests/file/007_variation10.phpt @@ -30,7 +30,7 @@ echo "*** Test fopen() & fclose() functions: with 'r+t' mode ***\n"; $file_handle = fopen($file, "r+t"); //opening the file in "r+t" mode var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the end of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string diff --git a/ext/standard/tests/file/007_variation11-win32.phpt b/ext/standard/tests/file/007_variation11-win32.phpt index d9c6e83d48687..a567b72b03eca 100644 --- a/ext/standard/tests/file/007_variation11-win32.phpt +++ b/ext/standard/tests/file/007_variation11-win32.phpt @@ -36,12 +36,12 @@ echo "*** Test fopen() & fclose() functions: with 'wt' mode ***\n"; $file_handle = fopen($file, "wt"); //opening the file "wt" mode var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the begining of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation @@ -53,7 +53,7 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wt") ); //Opening the non-existing file in "wt" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file +var_dump( file_exists($file) ); //Check for the existence of file echo "*** Done ***\n"; --CLEAN-- --EXPECT-- ccd9fe66 diff --git a/ext/standard/tests/strings/bug50847.phpt b/ext/standard/tests/strings/bug50847.phpt index 28e83f5111fe8..1f7081930e6ad 100644 --- a/ext/standard/tests/strings/bug50847.phpt +++ b/ext/standard/tests/strings/bug50847.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #50847 (strip_tags() removes all tags greater then 1023 bytes long) +Bug #50847 (strip_tags() removes all tags greater than 1023 bytes long) --FILE-- '; diff --git a/ext/standard/tests/strings/chop_variation1.phpt b/ext/standard/tests/strings/chop_variation1.phpt index de5ecd8164643..bb5bca4ecfe70 100644 --- a/ext/standard/tests/strings/chop_variation1.phpt +++ b/ext/standard/tests/strings/chop_variation1.phpt @@ -82,7 +82,7 @@ $values = array ( // loop through each element of the array and check the working of chop() -// when $str arugment is supplied with different values +// when $str argument is supplied with different values echo "\n--- Testing chop() by supplying different values for 'str' argument ---\n"; $counter = 1; diff --git a/ext/standard/tests/strings/chop_variation2.phpt b/ext/standard/tests/strings/chop_variation2.phpt index f0416e77bc14e..02d32306ecd38 100644 --- a/ext/standard/tests/strings/chop_variation2.phpt +++ b/ext/standard/tests/strings/chop_variation2.phpt @@ -82,7 +82,7 @@ $values = array ( // loop through each element of the array and check the working of chop() -// when $charlist arugment is supplied with different values +// when $charlist argument is supplied with different values echo "\n--- Testing chop() by supplying different values for 'charlist' argument ---\n"; $counter = 1; diff --git a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt index 7f7e229354aef..76d590c35b021 100644 --- a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt @@ -65,7 +65,7 @@ $values = array ( // loop through each element of the array and check the working of get_html_translation_table() -// when $table arugment is supplied with different values +// when $table argument is supplied with different values echo "\n--- Testing get_html_translation_table() by supplying different values for 'table' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt index b792a555451e3..ea42af996ca59 100644 --- a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt @@ -68,7 +68,7 @@ $values = array ( // loop through each element of the array and check the working of get_html_translation_table() -// when $quote_style arugment is supplied with different values +// when $quote_style argument is supplied with different values echo "\n--- Testing get_html_translation_table() by supplying different values for 'quote_style' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt index b15307614a9d6..b36556f1a2782 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt @@ -30,7 +30,7 @@ $multiline_string = <<Roy's height\r > Sam\t's height 1111\t\t & 0000\v\v = \f0000 diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt index 02bcf34406390..e2635f05f8d78 100644 --- a/ext/standard/tests/strings/join_variation1.phpt +++ b/ext/standard/tests/strings/join_variation1.phpt @@ -84,7 +84,7 @@ $values = array ( // loop through each element of the array and check the working of join() -// when $glue arugment is supplied with different values +// when $glue argument is supplied with different values echo "\n--- Testing join() by supplying different values for 'glue' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/ext/standard/tests/strings/join_variation2.phpt b/ext/standard/tests/strings/join_variation2.phpt index 50395f17647b1..46e91afd3bb62 100644 --- a/ext/standard/tests/strings/join_variation2.phpt +++ b/ext/standard/tests/strings/join_variation2.phpt @@ -82,7 +82,7 @@ $values = array ( // loop through each element of the array and check the working of join() -// when $pieces arugment is supplied with different values +// when $pieces argument is supplied with different values echo "\n--- Testing join() by supplying different values for 'pieces' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/ext/standard/tests/strings/setlocale_basic1.phpt b/ext/standard/tests/strings/setlocale_basic1.phpt index 957357f6c1773..c806e6fabf8ce 100644 --- a/ext/standard/tests/strings/setlocale_basic1.phpt +++ b/ext/standard/tests/strings/setlocale_basic1.phpt @@ -14,7 +14,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d /* Prototype : string setlocale (int $category , string $locale [,string $..] ) : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , - * or FALSE if locale functinality is not implemented in this platform. + * or FALSE if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/setlocale_basic2.phpt b/ext/standard/tests/strings/setlocale_basic2.phpt index fe61b9b431229..7204c459114f8 100644 --- a/ext/standard/tests/strings/setlocale_basic2.phpt +++ b/ext/standard/tests/strings/setlocale_basic2.phpt @@ -14,7 +14,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d /* Prototype : string setlocale (int $category , string $locale [,string $..] ) : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - if locale functinality is not implemented in this platform. + if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/setlocale_basic3.phpt b/ext/standard/tests/strings/setlocale_basic3.phpt index 47917e34e4bca..997dad98e7cd8 100644 --- a/ext/standard/tests/strings/setlocale_basic3.phpt +++ b/ext/standard/tests/strings/setlocale_basic3.phpt @@ -14,7 +14,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) { /* Prototype : string setlocale (int $category , string $locale [,string $..] ) : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - if locale functinality is not implemented in this platform. + if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/ext/standard/tests/strings/setlocale_error.phpt b/ext/standard/tests/strings/setlocale_error.phpt index e3f3765fbf7db..361d00c5843aa 100644 --- a/ext/standard/tests/strings/setlocale_error.phpt +++ b/ext/standard/tests/strings/setlocale_error.phpt @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { --EXPECTF-- -*** Testing strcspn() : with diferent unexpected values of mask argument *** +*** Testing strcspn() : with different unexpected values of mask argument *** -- Iteration with mask value as "0" -- int(10) diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt index 54601e9b65857..20b5693905026 100644 --- a/ext/standard/tests/strings/strip_tags_variation5.phpt +++ b/ext/standard/tests/strings/strip_tags_variation5.phpt @@ -33,7 +33,7 @@ $multiline_string = <<This is a double quoted string EOT; -// here doc with diferent whitespaces +// here doc with different whitespaces $diff_whitespaces = <<hello\r world\t 1111\t\t != 2222\v\v diff --git a/ext/standard/tests/strings/stripcslashes_variation1.phpt b/ext/standard/tests/strings/stripcslashes_variation1.phpt index 32c8963df7f1d..a2754c6103111 100644 --- a/ext/standard/tests/strings/stripcslashes_variation1.phpt +++ b/ext/standard/tests/strings/stripcslashes_variation1.phpt @@ -81,7 +81,7 @@ $values = array ( // loop through each element of the array and check the working of stripcslashes() -// when $str arugment is supplied with different values +// when $str argument is supplied with different values echo "\n--- Testing stripcslashes() by supplying different values for 'str' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/ext/standard/tests/strings/stripslashes_variation1.phpt b/ext/standard/tests/strings/stripslashes_variation1.phpt index 5693a26efcd2b..fb104199bd47b 100644 --- a/ext/standard/tests/strings/stripslashes_variation1.phpt +++ b/ext/standard/tests/strings/stripslashes_variation1.phpt @@ -80,7 +80,7 @@ $values = array ( // loop through each element of the array and check the working of stripslashes() -// when $str arugment is supplied with different values +// when $str argument is supplied with different values echo "\n--- Testing stripslashes() by supplying different values for 'str' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/ext/standard/tests/strings/strrchr_basic.phpt b/ext/standard/tests/strings/strrchr_basic.phpt index f396834837c3d..1d4e50efdfe64 100644 --- a/ext/standard/tests/strings/strrchr_basic.phpt +++ b/ext/standard/tests/strings/strrchr_basic.phpt @@ -30,7 +30,7 @@ var_dump( strrchr("Hello, World", "Hello, World") ); //needle as haystack //needle string containing one existing and one non-existing char var_dump( strrchr("Hello, World", "Hi") ); -//multiple existance of needle in haystack +//multiple existence of needle in haystack var_dump( strrchr("Hello, World", "o") ); var_dump( strrchr("Hello, World", "ooo") ); diff --git a/ext/standard/tests/strings/strspn_variation2.phpt b/ext/standard/tests/strings/strspn_variation2.phpt index 7af61e559ae92..57929fa3528b2 100644 --- a/ext/standard/tests/strings/strspn_variation2.phpt +++ b/ext/standard/tests/strings/strspn_variation2.phpt @@ -15,7 +15,7 @@ error_reporting(E_ALL & ~E_NOTICE); * Testing strspn() : with different unexpected values for mask argument */ -echo "*** Testing strspn() : with diferent unexpected values of mask argument ***\n"; +echo "*** Testing strspn() : with different unexpected values of mask argument ***\n"; $str = 'string_val'; $start = 1; @@ -102,7 +102,7 @@ fclose($file_handle); echo "Done" ?> --EXPECTF-- -*** Testing strspn() : with diferent unexpected values of mask argument *** +*** Testing strspn() : with different unexpected values of mask argument *** -- Iteration with mask value as "0" -- int(0) diff --git a/ext/standard/tests/strings/strtok_variation1.phpt b/ext/standard/tests/strings/strtok_variation1.phpt index b8febacfb961d..cb06fc43c3579 100644 --- a/ext/standard/tests/strings/strtok_variation1.phpt +++ b/ext/standard/tests/strings/strtok_variation1.phpt @@ -81,7 +81,7 @@ $values = array ( // loop through each element of the array and check the working of strtok() -// when $str arugment is supplied with different values +// when $str argument is supplied with different values echo "\n--- Testing strtok() by supplying different values for 'str' argument ---\n"; $counter = 1; diff --git a/ext/standard/tests/strings/strtok_variation2.phpt b/ext/standard/tests/strings/strtok_variation2.phpt index 19a6f26fb5140..13da4405824b9 100644 --- a/ext/standard/tests/strings/strtok_variation2.phpt +++ b/ext/standard/tests/strings/strtok_variation2.phpt @@ -81,7 +81,7 @@ $values = array ( // loop through each element of the array and check the working of strtok() -// when $token arugment is supplied with different values +// when $token argument is supplied with different values echo "\n--- Testing strtok() by supplying different values for 'token' argument ---\n"; $counter = 1; diff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt index b9323afbdf6e8903e1a2be1534680c41373ec97e..dd52efd98e4e3e599f8ae9d7cc2d297d8c62908c 100644 GIT binary patch delta 15 Wcmeyz|BrveHAbe~)Xg^-)z|ptr != NULL) { retval = xmlTextReaderRead(intern->ptr); if (retval == -1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while reading"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while reading"); RETURN_FALSE; } else { RETURN_BOOL(retval); @@ -847,7 +847,7 @@ PHP_METHOD(xmlreader, next) retval = xmlTextReaderNext(intern->ptr); } if (retval == -1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while reading"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while reading"); RETURN_FALSE; } else { RETURN_BOOL(retval); @@ -1155,7 +1155,7 @@ PHP_METHOD(xmlreader, expand) node = xmlTextReaderExpand(intern->ptr); if (node == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while expanding "); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while expanding "); RETURN_FALSE; } else { nodec = xmlDocCopyNode(node, docp, 1); diff --git a/ext/xmlrpc/libxmlrpc/simplestring.c b/ext/xmlrpc/libxmlrpc/simplestring.c index 7211d2cd94195..a084d0e64f347 100644 --- a/ext/xmlrpc/libxmlrpc/simplestring.c +++ b/ext/xmlrpc/libxmlrpc/simplestring.c @@ -66,7 +66,7 @@ static const char rcsid[] = "#(@) $Id$"; * * simplestring is, as the name implies, a simple API for dealing with C strings. * Why would I write yet another string API? Because I couldn't find any that were - * a) free / GPL, b) simple/lightweight, c) fast, not doing unneccesary strlens all + * a) free / GPL, b) simple/lightweight, c) fast, not doing unnecessary strlens all * over the place. So. It is simple, and it seems to work, and it is pretty fast. * * Oh, and it is also binary safe, ie it can handle strings with embedded NULLs, diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.c b/ext/xmlrpc/libxmlrpc/xmlrpc.c index ec2321b347e33..ce70c2afd909b 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc.c +++ b/ext/xmlrpc/libxmlrpc/xmlrpc.c @@ -897,7 +897,7 @@ const char *XMLRPC_SetValueID_Case(XMLRPC_VALUE value, const char* id, int len, (len > 0) ? simplestring_addn(&value->id, id, len) : simplestring_add(&value->id, id); - /* upper or lower case string in place if required. could be a seperate func. */ + /* upper or lower case string in place if required. could be a separate func. */ if(id_case == xmlrpc_case_lower || id_case == xmlrpc_case_upper) { int i; for(i = 0; i < value->id.len; i++) { @@ -1609,7 +1609,7 @@ XMLRPC_VALUE XMLRPC_CopyValue(XMLRPC_VALUE value) { * XMLRPC_CopyValue () * NOTES * Use this when function when you need to modify the contents of - * the copied value seperately from the original. + * the copied value separately from the original. * * this function is recursive, thus the value and all of its children * (if any) will be duplicated. diff --git a/ext/zip/lib/zip_open.c b/ext/zip/lib/zip_open.c index 2f56881b0a9d2..5ce1c1070ae03 100644 --- a/ext/zip/lib/zip_open.c +++ b/ext/zip/lib/zip_open.c @@ -348,7 +348,7 @@ _zip_checkcons(FILE *fp, struct zip_cdir *cd, struct zip_error *error) /* _zip_check_torrentzip: - check wether ZA has a valid TORRENTZIP comment, i.e. is torrentzipped */ + check whether ZA has a valid TORRENTZIP comment, i.e. is torrentzipped */ static void _zip_check_torrentzip(struct zip *za) diff --git a/ext/zip/tests/bug64342_0.phpt b/ext/zip/tests/bug64342_0.phpt index 066d3e6fc202a..ea7afa8e0a7d2 100644 --- a/ext/zip/tests/bug64342_0.phpt +++ b/ext/zip/tests/bug64342_0.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #64342 ZipArchive::addFile() has to check file existance (variation 1) +Bug #64342 ZipArchive::addFile() has to check file existence (variation 1) --SKIPIF-- socket, POLLOUT, 500); diff --git a/run-tests.php b/run-tests.php index 84907a705f8b2..8c8df610b8c02 100755 --- a/run-tests.php +++ b/run-tests.php @@ -683,7 +683,7 @@ function save_or_mail_results() -d foo=bar Pass -d option to the php binary (Define INI entry foo with value 'bar'). - -g Comma seperated list of groups to show during test run + -g Comma separated list of groups to show during test run (possible values: PASS, FAIL, XFAIL, SKIP, BORK, WARN, LEAK, REDIRECT). -m Test for memory leaks with Valgrind. diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c index 11be0ed222491..8361f7f41060d 100644 --- a/sapi/apache/mod_php5.c +++ b/sapi/apache/mod_php5.c @@ -130,7 +130,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC) /* * This handles the situation where the browser sends a Expect: 100-continue header - * and needs to recieve confirmation from the server on whether or not it can send + * and needs to receive confirmation from the server on whether or not it can send * the rest of the request. RFC 2616 * */ diff --git a/sapi/apache2filter/README b/sapi/apache2filter/README index 3054e208d3466..bd6eb17066db7 100644 --- a/sapi/apache2filter/README +++ b/sapi/apache2filter/README @@ -54,7 +54,7 @@ HOW TO CONFIGURE DEBUGGING APACHE AND PHP - To debug Apache, we recommened: + To debug Apache, we recommend: 1. Use the Prefork MPM (Apache 1.3-like process model) by configuring Apache with '--with-mpm=prefork'. diff --git a/sapi/apache2handler/README b/sapi/apache2handler/README index 5cbd1b95ddcd0..4defa336c6a91 100644 --- a/sapi/apache2handler/README +++ b/sapi/apache2handler/README @@ -58,7 +58,7 @@ HOW TO CONFIGURE DEBUGGING APACHE AND PHP - To debug Apache, we recommened: + To debug Apache, we recommend: 1. Use the Prefork MPM (Apache 1.3-like process model) by configuring Apache with '--with-mpm=prefork'. diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index bcb24431128fe..b7f95e0c12729 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -632,7 +632,7 @@ zend_first_try { } /* - * check if comming due to ErrorDocument + * check if coming due to ErrorDocument * We make a special exception of 413 (Invalid POST request) as the invalidity of the request occurs * during processing of the request by PHP during POST processing. Therefor we need to re-use the exiting * PHP instance to handle the request rather then creating a new one. diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c index dda6e4989128b..66adb482ed1a0 100644 --- a/sapi/apache_hooks/mod_php5.c +++ b/sapi/apache_hooks/mod_php5.c @@ -275,7 +275,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC) /* * This handles the situation where the browser sends a Expect: 100-continue header - * and needs to recieve confirmation from the server on whether or not it can send + * and needs to receive confirmation from the server on whether or not it can send * the rest of the request. RFC 2616 * */ diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index d85df188bf4eb..cd5fc34d0f2d0 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -697,7 +697,7 @@ static int fpm_evaluate_full_path(char **path, struct fpm_worker_pool_s *wp, cha if (tmp != NULL) { if (tmp != *path) { - zlog(ZLOG_ERROR, "'$prefix' must be use at the begining of the value"); + zlog(ZLOG_ERROR, "'$prefix' must be use at the beginning of the value"); return -1; } diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c index 1a1baa7078e42..548bcda170abe 100644 --- a/sapi/thttpd/thttpd.c +++ b/sapi/thttpd/thttpd.c @@ -579,7 +579,7 @@ static void queue_request(httpd_conn *hc) m->next = NULL; tsrm_mutex_lock(qr_lock); - /* Create new threads when reaching a certain threshhold */ + /* Create new threads when reaching a certain threshold */ if (nr_threads < max_threads && nr_free_threads < 2) { nr_threads++; /* protected by qr_lock */ diff --git a/server-tests-config.php b/server-tests-config.php index 47df90f5e6569..0ddff28cb2344 100755 --- a/server-tests-config.php +++ b/server-tests-config.php @@ -59,7 +59,7 @@ /* if true doesn't run tests, just outputs executable info */ 'TEST_CONTEXT_INFO' => false, -/* : or ; seperated list of paths */ +/* : or ; separated list of paths */ 'TEST_PATHS' => NULL /* additional configuration items that may be set to provide proxy support for testes: diff --git a/server-tests.php b/server-tests.php index ca39b198b8c8b..688fee485a00d 100755 --- a/server-tests.php +++ b/server-tests.php @@ -413,7 +413,7 @@ class testHarness { public $xargs = array( #arg env var value default description 'c' => array('' ,'file' ,NULL ,'configuration file, see server-tests-config.php for example'), - 'd' => array('TEST_PATHS' ,'paths' ,NULL ,'colon seperate path list'), + 'd' => array('TEST_PATHS' ,'paths' ,NULL ,'colon separate path list'), 'e' => array('TEST_PHP_ERROR_STYLE','EMACS|MSVC' ,'EMACS' ,'editor error style'), 'h' => array('' ,'' ,NULL ,'this help'), 'i' => array('PHPRC' ,'path|file' ,NULL ,'ini file to use for tests (sets PHPRC)'), diff --git a/win32/install.txt b/win32/install.txt index b1d4ee5148f58..2883dd37f5732 100644 --- a/win32/install.txt +++ b/win32/install.txt @@ -355,7 +355,7 @@ c:\php packages have the server modules in the sapi folder, PHP 5 distributions have no such directory and instead they're in the PHP folder root. The supporting DLLs for the PHP 5 extensions are also not - in a seperate directory. + in a separate directory. Note: In PHP 4, you should move all files located in the dll and sapi folders to the main folder (e.g. C:\php). diff --git a/win32/sendmail.c b/win32/sendmail.c index 4b09697e95dfe..3078307263601 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -119,8 +119,8 @@ static char *ErrorMessages[] = {"Error while trimming mail header with PCRE, please file a bug report at http://bugs.php.net/"} /* 21 */ }; -/* This pattern converts all single occurences of \n (Unix) - * withour a leading \r to \r\n and all occurences of \r (Mac) +/* This pattern converts all single occurrences of \n (Unix) + * withour a leading \r to \r\n and all occurrences of \r (Mac) * without a trailing \n to \r\n * Thx to Nibbler from ircnet/#linuxger */ @@ -130,7 +130,7 @@ static char *ErrorMessages[] = /* This pattern removes \r\n from the start of the string, * \r\n from the end of the string and also makes sure every line * is only wrapped with a single \r\n (thus reduces multiple - * occurences of \r\n between lines to a single \r\n) */ + * occurrences of \r\n between lines to a single \r\n) */ #define PHP_WIN32_MAIL_RMVDBL_PATTERN "/^\r\n|(\r\n)+$/m" #define PHP_WIN32_MAIL_RMVDBL_REPLACE "" @@ -142,11 +142,11 @@ static char *ErrorMessages[] = #define PHP_WIN32_MAIL_DOT_REPLACE "\n.." /* This function is meant to unify the headers passed to to mail() - * This means, use PCRE to transform single occurences of \n or \r in \r\n - * As a second step we also eleminate all \r\n occurences which are: + * This means, use PCRE to transform single occurrences of \n or \r in \r\n + * As a second step we also eleminate all \r\n occurrences which are: * 1) At the start of the header * 2) At the end of the header - * 3) Two or more occurences in the header are removed so only one is left + * 3) Two or more occurrences in the header are removed so only one is left * * Returns NULL on error, or the new char* buffer on success. * You have to take care and efree() the buffer on your own. diff --git a/win32/signal.h b/win32/signal.h index de43f98e8075b..df60dfb728f43 100644 --- a/win32/signal.h +++ b/win32/signal.h @@ -2,7 +2,7 @@ ** Change here: if you plan to use your own version of ** the original "#include " produces an infinite reinclusion ** of this file, instead of including the standard include-file. -** Under MS Visual Studio, there are occurences in the source where +** Under MS Visual Studio, there are occurrences in the source where ** gets included throughout the PHP sources, and this should ** include THIS file, not the standard one which does not have the ** additional signals defined below.