From 71e5615d53444bef72b16b19b359d78c52680c31 Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Thu, 28 Mar 2013 10:44:02 +0000 Subject: [PATCH 01/14] Typo fix (greater then => greater than) --- ext/standard/head.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/standard/head.c b/ext/standard/head.c index fa578175b193..5310ff6c03b2 100644 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@ -132,7 +132,7 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t efree(dt); efree(cookie); efree(encoded_value); - zend_error(E_WARNING, "Expiry date cannot have a year greater then 9999"); + zend_error(E_WARNING, "Expiry date cannot have a year greater than 9999"); return FAILURE; } strlcat(cookie, dt, len + 100); From eb1fea53ed7176ab4ea4a56fbeab32ca590ac8dc Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Mon, 22 Apr 2013 13:41:27 +0100 Subject: [PATCH 02/14] typo fixes (accommodate, parameter) --- README.PARAMETER_PARSING_API | 2 +- ext/pdo/pdo_sql_parser.c | 4 ++-- ext/pdo/pdo_sql_parser.re | 4 ++-- ext/soap/php_sdl.c | 4 ++-- ext/sqlite3/libsqlite/sqlite3.c | 4 ++-- ext/sqlite3/sqlite3.c | 2 +- ext/standard/user_filters.c | 2 +- sapi/isapi/stresstest/stresstest.cpp | 2 +- win32/glob.c | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.PARAMETER_PARSING_API b/README.PARAMETER_PARSING_API index edcee0f2eaa0..25a41096cf2e 100644 --- a/README.PARAMETER_PARSING_API +++ b/README.PARAMETER_PARSING_API @@ -43,7 +43,7 @@ See also https://wiki.php.net/rfc/zpp_improv#expose_zend_parse_arg_as_zend_parse Type specifiers --------------- The following list shows the type specifier, its meaning and the parameter - types that need to be passed by address. All passed paramaters are set + types that need to be passed by address. All passed parameters are set if the PHP parameter is non optional and untouched if optional and the parameter is not present. The only exception is O where the zend_class_entry* has to be provided on input and is used to verify the PHP parameter is an diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c index ec488e053f02..37c71987a941 100644 --- a/ext/pdo/pdo_sql_parser.c +++ b/ext/pdo/pdo_sql_parser.c @@ -761,9 +761,9 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char while (SUCCESS == zend_hash_get_current_data(params, (void**)¶m)) { if(param->parameter) { convert_to_string(param->parameter); - /* accomodate a string that needs to be fully quoted + /* accommodate a string that needs to be fully quoted bind placeholders are at least 2 characters, so - the accomodate their own "'s + the accommodate their own "'s */ newbuffer_len += padding * Z_STRLEN_P(param->parameter); } diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re index d4272d679b58..80e3b4f95f6f 100644 --- a/ext/pdo/pdo_sql_parser.re +++ b/ext/pdo/pdo_sql_parser.re @@ -408,9 +408,9 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char while (SUCCESS == zend_hash_get_current_data(params, (void**)¶m)) { if(param->parameter) { convert_to_string(param->parameter); - /* accomodate a string that needs to be fully quoted + /* accommodate a string that needs to be fully quoted bind placeholders are at least 2 characters, so - the accomodate their own "'s + the accommodate their own "'s */ newbuffer_len += padding * Z_STRLEN_P(param->parameter); } diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 33e137cbbb70..0ac4c2ed7a9b 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -40,8 +40,8 @@ static void delete_binding(void *binding); static void delete_binding_persistent(void *binding); static void delete_function(void *function); static void delete_function_persistent(void *function); -static void delete_parameter(void *paramater); -static void delete_parameter_persistent(void *paramater); +static void delete_parameter(void *parameter); +static void delete_parameter_persistent(void *parameter); static void delete_header(void *header); static void delete_header_persistent(void *header); static void delete_document(void *doc_ptr); diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index f3c06d49b1b0..7a8a121dd0a8 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -93617,7 +93617,7 @@ SQLITE_PRIVATE int sqlite3IndexedByLookup(Parse *pParse, struct SrcList_item *pF ** without worrying about messing up the presistent representation ** of the view. ** -** (3) Add terms to the WHERE clause to accomodate the NATURAL keyword +** (3) Add terms to the WHERE clause to accommodate the NATURAL keyword ** on joins and the ON and USING clause of joins. ** ** (4) Scan the list of columns in the result set (pEList) looking @@ -96115,7 +96115,7 @@ SQLITE_PRIVATE void sqlite3CodeRowTriggerDirect( /* ** This is called to code the required FOR EACH ROW triggers for an operation ** on table pTab. The operation to code triggers for (INSERT, UPDATE or DELETE) -** is given by the op paramater. The tr_tm parameter determines whether the +** is given by the op parameter. The tr_tm parameter determines whether the ** BEFORE or AFTER triggers are coded. If the operation is an UPDATE, then ** parameter pChanges is passed the list of columns being modified. ** diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index df449d738023..2aef0414aab6 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -1409,7 +1409,7 @@ static int register_bound_parameter_to_sqlite(struct php_sqlite3_bound_param *pa /* }}} */ /* {{{ proto bool SQLite3Stmt::bindParam(int parameter_number, mixed parameter [, int type]) - Bind Paramater to a stmt variable. */ + Bind Parameter to a stmt variable. */ PHP_METHOD(sqlite3stmt, bindParam) { php_sqlite3_stmt *stmt_obj; diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index b009e67aa155..b44be124a15e 100644 --- a/ext/standard/user_filters.c +++ b/ext/standard/user_filters.c @@ -474,7 +474,7 @@ static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS) } else { php_stream_bucket_prepend(brigade, bucket TSRMLS_CC); } - /* This is a hack necessary to accomodate situations where bucket is appended to the stream + /* This is a hack necessary to accommodate situations where bucket is appended to the stream * multiple times. See bug35916.phpt for reference. */ if (bucket->refcount == 1) { diff --git a/sapi/isapi/stresstest/stresstest.cpp b/sapi/isapi/stresstest/stresstest.cpp index 97824e6be8c8..9a5964a6ba7f 100644 --- a/sapi/isapi/stresstest/stresstest.cpp +++ b/sapi/isapi/stresstest/stresstest.cpp @@ -796,7 +796,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest, switch(dwHSERequest) { case (HSE_REQ_SEND_RESPONSE_HEADER) : - lpszRespBuf = (char *)xmalloc(*lpdwSize);//+ 80);//accomodate our header + lpszRespBuf = (char *)xmalloc(*lpdwSize);//+ 80);//accommodate our header if (!lpszRespBuf) return FALSE; wsprintf(lpszRespBuf,"%s", diff --git a/win32/glob.c b/win32/glob.c index a197f3bbee99..1aeac78fda07 100644 --- a/win32/glob.c +++ b/win32/glob.c @@ -689,7 +689,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, /* - * Extend the gl_pathv member of a glob_t structure to accomodate a new item, + * Extend the gl_pathv member of a glob_t structure to accommodate a new item, * add the new item, and update gl_pathc. * * This assumes the BSD realloc, which only copies the block when its size From 1aec6cf938fb1cfb920beff621d6d7c7e18e60a1 Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Mon, 22 Apr 2013 14:05:24 +0100 Subject: [PATCH 03/14] typo fixes (argument) --- Zend/zend_API.h | 4 ++-- ext/intl/tests/badargs.phpt | 2 +- ext/pcre/pcrelib/NEWS | 2 +- ext/sqlite3/libsqlite/sqlite3.c | 2 +- ext/standard/tests/array/009.phpt | 2 +- .../tests/array/array_fill_keys_error.phpt | 4 ++-- ext/standard/tests/array/array_merge.phpt | 2 +- .../tests/array/array_walk_basic2.phpt | 2 +- .../array/array_walk_recursive_basic2.phpt | 2 +- .../class_exists_variation_001.phpt | 2 +- .../class_exists_variation_002.phpt | 2 +- .../trait_exists_variation_001.phpt | 2 +- .../trait_exists_variation_002.phpt | 2 +- ext/standard/tests/file/005_error.phpt | 2 +- ext/standard/tests/file/fileinode_error.phpt | 4 ++-- ext/standard/tests/file/fstat_variation1.phpt | 2 +- ext/standard/tests/file/fstat_variation2.phpt | 2 +- ext/standard/tests/file/fstat_variation3.phpt | 2 +- ext/standard/tests/file/fstat_variation4.phpt | 2 +- ext/standard/tests/file/fstat_variation5.phpt | 2 +- ext/standard/tests/file/fstat_variation6.phpt | 2 +- ext/standard/tests/file/fstat_variation7.phpt | 2 +- .../tests/strings/chunk_split_error.phpt | 2 +- ext/zlib/tests/gzfile_variation1.phpt | 2 +- ext/zlib/tests/gzfile_variation10.phpt | 2 +- ext/zlib/tests/gzfile_variation11.phpt | 2 +- ext/zlib/tests/gzfile_variation12.phpt | 2 +- ext/zlib/tests/gzfile_variation13.phpt | 2 +- ext/zlib/tests/gzfile_variation14.phpt | 2 +- ext/zlib/tests/gzfile_variation2.phpt | 2 +- ext/zlib/tests/gzfile_variation3.phpt | 2 +- ext/zlib/tests/gzfile_variation4.phpt | 2 +- ext/zlib/tests/gzfile_variation5.phpt | 2 +- ext/zlib/tests/gzfile_variation6.phpt | 2 +- ext/zlib/tests/gzfile_variation7.phpt | 2 +- ext/zlib/tests/gzfile_variation8.phpt | 2 +- ext/zlib/tests/gzfile_variation9.phpt | 2 +- ext/zlib/tests/readgzfile_variation1.phpt | 2 +- ext/zlib/tests/readgzfile_variation10.phpt | 2 +- ext/zlib/tests/readgzfile_variation11.phpt | 2 +- ext/zlib/tests/readgzfile_variation12.phpt | 2 +- ext/zlib/tests/readgzfile_variation13.phpt | 2 +- ext/zlib/tests/readgzfile_variation14.phpt | 2 +- ext/zlib/tests/readgzfile_variation2.phpt | 2 +- ext/zlib/tests/readgzfile_variation3.phpt | 2 +- ext/zlib/tests/readgzfile_variation4.phpt | 2 +- ext/zlib/tests/readgzfile_variation5.phpt | 2 +- ext/zlib/tests/readgzfile_variation6.phpt | 2 +- ext/zlib/tests/readgzfile_variation7.phpt | 2 +- ext/zlib/tests/readgzfile_variation8.phpt | 2 +- ext/zlib/tests/readgzfile_variation9.phpt | 2 +- sapi/fpm/php-fpm.conf.in | 2 +- scripts/dev/generate-phpt.phar | Bin 52353 -> 52354 bytes scripts/dev/generate-phpt/src/gtFunction.php | 2 +- 54 files changed, 56 insertions(+), 56 deletions(-) diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 26aa1e6b1773..63bd8b334b14 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -465,7 +465,7 @@ ZEND_API extern const zend_fcall_info_cache empty_fcall_info_cache; */ ZEND_API int zend_fcall_info_init(zval *callable, uint check_flags, zend_fcall_info *fci, zend_fcall_info_cache *fcc, char **callable_name, char **error TSRMLS_DC); -/** Clear argumens connected with zend_fcall_info *fci +/** Clear arguments connected with zend_fcall_info *fci * If free_mem is not zero then the params array gets free'd as well */ ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, int free_mem); @@ -503,7 +503,7 @@ ZEND_API int zend_fcall_info_argv(zend_fcall_info *fci TSRMLS_DC, int argc, va_l ZEND_API int zend_fcall_info_argn(zend_fcall_info *fci TSRMLS_DC, int argc, ...); /** Call a function using information created by zend_fcall_info_init()/args(). - * If args is given then those replace the arguement info in fci is temporarily. + * If args is given then those replace the argument info in fci is temporarily. */ ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval **retval, zval *args TSRMLS_DC); diff --git a/ext/intl/tests/badargs.phpt b/ext/intl/tests/badargs.phpt index b8f48b371eb3..b2120977f372 100644 --- a/ext/intl/tests/badargs.phpt +++ b/ext/intl/tests/badargs.phpt @@ -1,5 +1,5 @@ --TEST-- -Check that bad argumens return the same +Check that bad arguments return the same --SKIPIF-- --FILE-- diff --git a/ext/pcre/pcrelib/NEWS b/ext/pcre/pcrelib/NEWS index ebd9c5ec9d99..082139f222e8 100644 --- a/ext/pcre/pcrelib/NEWS +++ b/ext/pcre/pcrelib/NEWS @@ -591,7 +591,7 @@ some of the new functionality in Perl 5.005. Another (I hope this is the last!) change has been made to the API for the pcre_compile() function. An additional argument has been added to make it possible to pass over a pointer to character tables built in the current -locale by pcre_maketables(). To use the default tables, this new arguement +locale by pcre_maketables(). To use the default tables, this new argument should be passed as NULL. IMPORTANT FOR THOSE UPGRADING FROM VERSION 2.05 diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index 7a8a121dd0a8..2bcd2409a9e8 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -93544,7 +93544,7 @@ static u8 minMaxQuery(Select *p){ /* ** The select statement passed as the first argument is an aggregate query. -** The second argment is the associated aggregate-info object. This +** The second argument is the associated aggregate-info object. This ** function tests if the SELECT is of the form: ** ** SELECT count(*) FROM diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt index f88f8763fad8..7b3bba22610d 100644 --- a/ext/standard/tests/array/009.phpt +++ b/ext/standard/tests/array/009.phpt @@ -94,7 +94,7 @@ var_dump( current($temp_array, $temp_array) ); var_dump( reset($temp_array, $temp_array) ); var_dump( next($temp_array, $temp_array) ); -// invalid args type, valid arguement: array +// invalid args type, valid argument: array $int_var = 1; $float_var = 1.5; $string = "string"; diff --git a/ext/standard/tests/array/array_fill_keys_error.phpt b/ext/standard/tests/array/array_fill_keys_error.phpt index 31a03e7f5f24..012a729d62bf 100644 --- a/ext/standard/tests/array/array_fill_keys_error.phpt +++ b/ext/standard/tests/array/array_fill_keys_error.phpt @@ -20,7 +20,7 @@ var_dump( array_fill_keys($keys, $val, $extra_arg) ); echo "\n-- Testing array_fill_keys() function with less than expected no. of arguments --\n"; var_dump( array_fill_keys($keys) ); -echo "\n-- Testing array_fill_keys() function with no argumets --\n"; +echo "\n-- Testing array_fill_keys() function with no arguments --\n"; var_dump( array_fill_keys() ); echo "Done"; @@ -38,7 +38,7 @@ NULL Warning: array_fill_keys() expects exactly 2 parameters, 1 given in %sarray_fill_keys_error.php on line %d NULL --- Testing array_fill_keys() function with no argumets -- +-- Testing array_fill_keys() function with no arguments -- Warning: array_fill_keys() expects exactly 2 parameters, 0 given in %sarray_fill_keys_error.php on line %d NULL diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt index b718386da1b0..30830de2b300 100644 --- a/ext/standard/tests/array/array_merge.phpt +++ b/ext/standard/tests/array/array_merge.phpt @@ -79,7 +79,7 @@ echo "\n*** Testing array_merge() with typecasting non-array to array ***\n"; var_dump(array_merge($begin_array[4], (array)"type1", (array)10, (array)12.34)); echo "\n*** Testing error conditions ***"; -/* Invalid argumens */ +/* Invalid arguments */ var_dump(array_merge()); var_dump(array_merge(100, 200)); var_dump(array_merge($begin_array[0], $begin_array[1], 100)); diff --git a/ext/standard/tests/array/array_walk_basic2.phpt b/ext/standard/tests/array/array_walk_basic2.phpt index e856b580ba79..3ef15605e710 100644 --- a/ext/standard/tests/array/array_walk_basic2.phpt +++ b/ext/standard/tests/array/array_walk_basic2.phpt @@ -25,7 +25,7 @@ function test_alter(&$item, $key, $prefix) // with proper type var_dump($item); // value var_dump($key); // key - var_dump($prefix); // additional agument passed to callback function + var_dump($prefix); // additional argument passed to callback function echo "\n"; // new line to separate the output between each element } diff --git a/ext/standard/tests/array/array_walk_recursive_basic2.phpt b/ext/standard/tests/array/array_walk_recursive_basic2.phpt index c71d92b4569a..a049c0b812f6 100644 --- a/ext/standard/tests/array/array_walk_recursive_basic2.phpt +++ b/ext/standard/tests/array/array_walk_recursive_basic2.phpt @@ -25,7 +25,7 @@ function test_alter(&$item, $key, $prefix) // with proper type var_dump($item); // value var_dump($key); // key - var_dump($prefix); // additional agument passed to callback function + var_dump($prefix); // additional argument passed to callback function echo "\n"; // new line to separate the output between each element } diff --git a/ext/standard/tests/class_object/class_exists_variation_001.phpt b/ext/standard/tests/class_object/class_exists_variation_001.phpt index c9146ba9f78e..52a3584763e1 100644 --- a/ext/standard/tests/class_object/class_exists_variation_001.phpt +++ b/ext/standard/tests/class_object/class_exists_variation_001.phpt @@ -1,5 +1,5 @@ --TEST-- -Test class_exists() function : usage variations - unexpected types for agument 1 +Test class_exists() function : usage variations - unexpected types for argument 1 --FILE-- Date: Tue, 23 Apr 2013 10:38:29 +0100 Subject: [PATCH 04/14] typofixes (committed) --- ext/interbase/tests/005.phpt | 4 ++-- ext/pgsql/README | 2 +- ext/sqlite3/libsqlite/sqlite3.c | 4 ++-- ext/standard/tests/file/bug52820.phpt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/interbase/tests/005.phpt b/ext/interbase/tests/005.phpt index 5b16ac291767..c5167c132e46 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/pgsql/README b/ext/pgsql/README index 2b4c412338d4..785b4f034b35 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/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index 2bcd2409a9e8..a6b9a2d7c88c 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -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. @@ -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. diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt index 91976b04db3f..3a9f9c31a467 100644 --- a/ext/standard/tests/file/bug52820.phpt +++ b/ext/standard/tests/file/bug52820.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #52820 (writes to fopencookie FILE* not commited when seeking the stream) +Bug #52820 (writes to fopencookie FILE* not committed when seeking the stream) --SKIPIF-- Date: Tue, 23 Apr 2013 10:39:24 +0100 Subject: [PATCH 05/14] typofixes (guaranteed) --- ext/sqlite3/libsqlite/sqlite3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index a6b9a2d7c88c..249edea0c3a2 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -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( From 5633479c44d085142c560cb0583abf3b744517a2 Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Tue, 23 Apr 2013 10:46:30 +0100 Subject: [PATCH 06/14] typo fixes (existence) --- acinclude.m4 | 2 +- ext/dba/tests/dba_cdb_read.phpt | 2 +- ext/sqlite3/libsqlite/sqlite3.c | 16 ++++++++-------- .../tests/file/007_variation11-win32.phpt | 2 +- ext/standard/tests/file/007_variation11.phpt | 2 +- .../tests/file/007_variation12-win32.phpt | 2 +- ext/standard/tests/file/007_variation12.phpt | 2 +- .../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_variation19.phpt | 2 +- ext/standard/tests/file/007_variation20.phpt | 2 +- ext/standard/tests/file/007_variation21.phpt | 2 +- ext/standard/tests/file/007_variation22.phpt | 2 +- ext/standard/tests/file/007_variation3.phpt | 2 +- ext/standard/tests/file/007_variation4.phpt | 2 +- ext/standard/tests/file/007_variation5.phpt | 2 +- ext/standard/tests/file/007_variation6.phpt | 2 +- ext/standard/tests/strings/strrchr_basic.phpt | 2 +- ext/zip/tests/bug64342_0.phpt | 2 +- ext/zip/tests/bug64342_1.phpt | 2 +- 21 files changed, 28 insertions(+), 28 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 11ff779ff19a..b545f06944dd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1832,7 +1832,7 @@ AC_TRY_COMPILE([ ]) dnl ------------------------------------------------------------------------- -dnl Library/function existance and build sanity checks +dnl Library/function existence and build sanity checks dnl ------------------------------------------------------------------------- dnl diff --git a/ext/dba/tests/dba_cdb_read.phpt b/ext/dba/tests/dba_cdb_read.phpt index 71575f5d85e8..a782a572e9cc 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/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index 249edea0c3a2..3b2c4b3a238d 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -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. @@ -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: diff --git a/ext/standard/tests/file/007_variation11-win32.phpt b/ext/standard/tests/file/007_variation11-win32.phpt index d9c6e83d4868..c62beae2efa9 100644 --- a/ext/standard/tests/file/007_variation11-win32.phpt +++ b/ext/standard/tests/file/007_variation11-win32.phpt @@ -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-- Date: Tue, 23 Apr 2013 11:00:32 +0100 Subject: [PATCH 07/14] typofixes (occurrence) --- Zend/zend_compile.c | 2 +- ext/intl/doc/grapheme_api.php | 4 ++-- ext/sqlite3/libsqlite/sqlite3.c | 6 +++--- win32/sendmail.c | 12 ++++++------ win32/signal.h | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 3c0d753b6649..34da4fb37f83 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7176,7 +7176,7 @@ ZEND_API size_t zend_dirname(char *path, size_t len) } #elif defined(NETWARE) /* - * Find the first occurence of : from the left + * Find the first occurrence of : from the left * move the path pointer to the position just after : * increment the len_adjust to the length of path till colon character(inclusive) * If there is no character beyond : simple return len diff --git a/ext/intl/doc/grapheme_api.php b/ext/intl/doc/grapheme_api.php index 465453fd324c..e22d165cbbcd 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/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index 3b2c4b3a238d..27287a5ca3ae 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -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: @@ -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 diff --git a/win32/sendmail.c b/win32/sendmail.c index 4b09697e95df..307830726360 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 de43f98e8075..df60dfb728f4 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. From c0a6abe35b14f88a262722fbd2d19e51a83a437e Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Tue, 23 Apr 2013 11:01:49 +0100 Subject: [PATCH 08/14] typofixes (recommend) --- sapi/apache2filter/README | 2 +- sapi/apache2handler/README | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sapi/apache2filter/README b/sapi/apache2filter/README index 3054e208d346..bd6eb17066db 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 5cbd1b95ddcd..4defa336c6a9 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'. From 7f0de9be7ea88e46affead228e78dadd25c1f977 Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Tue, 23 Apr 2013 11:03:30 +0100 Subject: [PATCH 09/14] typofixes (reference) --- Zend/tests/gc_007.phpt | 2 +- Zend/tests/gc_008.phpt | 2 +- Zend/tests/gc_009.phpt | 2 +- ext/soap/TODO.old | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Zend/tests/gc_007.phpt b/Zend/tests/gc_007.phpt index 8601ea43b151..a018e4846df6 100644 --- a/Zend/tests/gc_007.phpt +++ b/Zend/tests/gc_007.phpt @@ -1,5 +1,5 @@ --TEST-- -GC 007: Unreferensed array cycle +GC 007: Unreferenced array cycle --INI-- zend.enable_gc=1 --FILE-- diff --git a/Zend/tests/gc_008.phpt b/Zend/tests/gc_008.phpt index 289d581d6068..4e27e5b70ad3 100644 --- a/Zend/tests/gc_008.phpt +++ b/Zend/tests/gc_008.phpt @@ -1,5 +1,5 @@ --TEST-- -GC 008: Unreferensed object cycle +GC 008: Unreferenced object cycle --INI-- zend.enable_gc=1 --FILE-- diff --git a/Zend/tests/gc_009.phpt b/Zend/tests/gc_009.phpt index 263d31f45b9f..3f4657d2e31b 100644 --- a/Zend/tests/gc_009.phpt +++ b/Zend/tests/gc_009.phpt @@ -1,5 +1,5 @@ --TEST-- -GC 009: Unreferensed array-object cycle +GC 009: Unreferenced array-object cycle --INI-- zend.enable_gc=1 --FILE-- diff --git a/ext/soap/TODO.old b/ext/soap/TODO.old index 59deb4b9dc09..a63874cc30b1 100644 --- a/ext/soap/TODO.old +++ b/ext/soap/TODO.old @@ -2,7 +2,7 @@ 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 seralization 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 From 22ccb70bd2b057e4a9fd4345e462375cdb5a3e58 Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Tue, 23 Apr 2013 11:03:41 +0100 Subject: [PATCH 10/14] typofixes (relevant) --- ext/soap/tests/bugs/bug27742.wsdl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/soap/tests/bugs/bug27742.wsdl b/ext/soap/tests/bugs/bug27742.wsdl index f38d91185233..4345ab7a7be2 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. From 335c356f7ec96168a54ba04e45676651040c31cd Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Tue, 23 Apr 2013 11:04:28 +0100 Subject: [PATCH 11/14] typofixes (schedule) --- ext/opcache/ZendAccelerator.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index 063c95102755..06a2cf7f4aca 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -168,7 +168,7 @@ typedef time_t accel_time_t; typedef enum _zend_accel_restart_reason { ACCEL_RESTART_OOM, /* restart because of out of memory */ ACCEL_RESTART_HASH, /* restart because of hash overflow */ - ACCEL_RESTART_USER /* restart sheduled by opcache_reset() */ + ACCEL_RESTART_USER /* restart scheduled by opcache_reset() */ } zend_accel_restart_reason; typedef struct _zend_persistent_script { @@ -268,7 +268,7 @@ typedef struct _zend_accel_shared_globals { unsigned long blacklist_misses; unsigned long oom_restarts; /* number of restarts because of out of memory */ unsigned long hash_restarts; /* number of restarts because of hash overflow */ - unsigned long manual_restarts; /* number of restarts sheduled by opcache_reset() */ + unsigned long manual_restarts; /* number of restarts scheduled by opcache_reset() */ zend_accel_hash hash; /* hash table for cached scripts */ zend_accel_hash include_paths; /* used "include_path" values */ From 4dfaa6e337296f0781f8df8abaa2a45a9381f132 Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Tue, 23 Apr 2013 11:09:16 +0100 Subject: [PATCH 12/14] typofixes (existence 2) --- ext/pcre/pcrelib/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/pcre/pcrelib/ChangeLog b/ext/pcre/pcrelib/ChangeLog index 1b016ecee521..ed164fed0fc5 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.) From 1b041145235dcc79e575e83831da83fd8d31e4e7 Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Tue, 23 Apr 2013 11:20:05 +0100 Subject: [PATCH 13/14] typofixes (accommodate) --- ext/odbc/php_odbc_includes.h | 2 +- ext/sqlite3/libsqlite/sqlite3.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h index 8251528e19c2..ca237c0537bf 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/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index 27287a5ca3ae..89bc84e6bf1a 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -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){ @@ -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 ){ From ea24ed6e150a483933ef53ecfbb4967a68ea4872 Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Tue, 23 Apr 2013 11:26:46 +0100 Subject: [PATCH 14/14] typofixes (occurrence 2) --- build/shtool | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/shtool b/build/shtool index d50aa1dbb85d..684a01f5df96 100755 --- a/build/shtool +++ b/build/shtool @@ -376,11 +376,11 @@ while [ $# -gt 0 ]; do eval "opt_${opt_OPT}=yes" ;; ':' ) - # option with argument (multiple occurances override) + # option with argument (multiple occurrences override) eval "opt_${opt_OPT}=\"\$opt_ARG\"" ;; '+' ) - # option with argument (multiple occurances append) + # option with argument (multiple occurrences append) eval "opt_${opt_OPT}=\"\$opt_${opt_OPT}\${ASC_NL}\$opt_ARG\"" ;; * )