Commit: 6c4af15d6c87f43ff3902e51e4ad79aa55e60d49 Author: Veres Lajos <vla...@gmail.com> Sun, 7 Jul 2013 22:40:16 +0100 Committer: Stanislav Malyshev <s...@php.net> Mon, 15 Jul 2013 00:19:32 -0700 Parents: 2c8a4af892151f9991345e57d67f27b19b9ff6ef Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6c4af15d6c87f43ff3902e51e4ad79aa55e60d49 Log: typos (orig) Changed paths: M Zend/zend_generators.c M ext/opcache/tests/compact_literals.phpt M ext/openssl/openssl.c M ext/sqlite3/libsqlite/sqlite3.c Diff: diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index 4b22eb2..1a805bb 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -55,7 +55,7 @@ ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished zval_ptr_dtor(&execute_data->current_this); } - /* A fatal error / die occured during the generator execution. Trying to clean + /* A fatal error / die occurred during the generator execution. Trying to clean * up the stack may not be safe in this case. */ if (CG(unclean_shutdown)) { return; diff --git a/ext/opcache/tests/compact_literals.phpt b/ext/opcache/tests/compact_literals.phpt index a691b91..367331f 100644 --- a/ext/opcache/tests/compact_literals.phpt +++ b/ext/opcache/tests/compact_literals.phpt @@ -22,7 +22,7 @@ unset($array["2"]); print_r($array); -echo "funcion define" . ":" . PHP_EOL; +echo "function define" . ":" . PHP_EOL; if (!function_exists("dummy")) { function dummy() { var_dump(__FUNCTION__); @@ -165,7 +165,7 @@ Array [1] => one [two] => 2 ) -funcion define: +function define: string(5) "dummy" string(11) "lambdadummy" string(1) "A" diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 68f3aaf..36efd1b 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -1492,7 +1492,7 @@ PHP_FUNCTION(openssl_spki_verify) pkey = X509_PUBKEY_get(spki->spkac->pubkey); if (pkey == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to aquire signed public key"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to acquire signed public key"); goto cleanup; } @@ -1549,7 +1549,7 @@ PHP_FUNCTION(openssl_spki_export) pkey = X509_PUBKEY_get(spki->spkac->pubkey); if (pkey == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to aquire signed public key"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to acquire signed public key"); goto cleanup; } diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c index 784be51..9c882c9 100644 --- a/ext/sqlite3/libsqlite/sqlite3.c +++ b/ext/sqlite3/libsqlite/sqlite3.c @@ -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 preceds the zFrom ending, then change the +** of the word that precede the zFrom ending, then change the ** ending to zTo. ** ** The input word *pz and zFrom are both in reverse order. zTo @@ -127688,7 +127688,7 @@ SQLITE_API int sqlite3_extension_init( ** * Implementations of the SQL scalar upper() and lower() functions ** for case mapping. ** -** * Integration of ICU and SQLite collation seqences. +** * Integration of ICU and SQLite collation sequences. ** ** * An implementation of the LIKE operator that uses ICU to ** provide case-independent matching. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
