diff options
| -rw-r--r-- | ext/mysqlnd/mysqlnd_auth.c | 2 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/compact_literals.c | 2 | ||||
| -rw-r--r-- | ext/opcache/zend_accelerator_module.c | 2 | ||||
| -rw-r--r-- | ext/pdo_pgsql/pgsql_driver.c | 2 | ||||
| -rwxr-xr-x | server-tests.php | 2 | ||||
| -rw-r--r-- | win32/build/template.rc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index b52e4b8762..3111980626 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -1049,7 +1049,7 @@ mysqlnd_caching_sha2_handle_server_response(struct st_mysqlnd_authentication_plu switch (result_packet.response_code) { case 3: - DBG_INF("fast path suceeded"); + DBG_INF("fast path succeeded"); DBG_VOID_RETURN; case 4: if (conn->vio->data->ssl || conn->unix_socket.s) { diff --git a/ext/opcache/Optimizer/compact_literals.c b/ext/opcache/Optimizer/compact_literals.c index b70f5c2e28..e10b9feab0 100644 --- a/ext/opcache/Optimizer/compact_literals.c +++ b/ext/opcache/Optimizer/compact_literals.c @@ -333,7 +333,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx memset(map, 0, op_array->last_literal * sizeof(int)); for (i = 0; i < op_array->last_literal; i++) { if (!info[i].flags) { - /* unsed literal */ + /* unset literal */ zval_ptr_dtor_nogc(&op_array->literals[i]); continue; } diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index 53afc2ce78..e2c73c61ed 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -262,7 +262,7 @@ static ZEND_INI_MH(OnUpdateFileCache) #else _access(ZSTR_VAL(new_value), 06) != 0) { #endif - zend_accel_error(ACCEL_LOG_WARNING, "opcache.file_cache must be a full path of accessable directory.\n"); + zend_accel_error(ACCEL_LOG_WARNING, "opcache.file_cache must be a full path of accessible directory.\n"); new_value = NULL; } } diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 863e37d89a..64be3cd9b8 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -1064,7 +1064,7 @@ static PHP_METHOD(PDO, pgsqlGetNotify) RETURN_FALSE; #if ZEND_ENABLE_ZVAL_LONG64 } else if (ms_timeout > INT_MAX) { - php_error_docref(NULL, E_WARNING, "timeout was shrinked to %d", INT_MAX); + php_error_docref(NULL, E_WARNING, "timeout was shrunk to %d", INT_MAX); ms_timeout = INT_MAX; #endif } diff --git a/server-tests.php b/server-tests.php index 4f51c88a7a..5f38e2f22e 100755 --- a/server-tests.php +++ b/server-tests.php @@ -413,7 +413,7 @@ class testHarness { 'm' => array('TEST_BASE_PATH' ,'path' ,NULL ,'copy tests to this path before testing'), 'n' => array('NO_PHPTEST_SUMMARY' ,'' ,0 ,'do not print test summary'), 'p' => array('TEST_PHP_EXECUTABLE' ,'path' ,NULL ,'php executable to be tested'), - 'q' => array('NO_INTERACTION' ,'' ,0 ,'no console interaction (ie dont contact QA)'), + 'q' => array('NO_INTERACTION' ,'' ,0 ,'no console interaction (ie don\'t contact QA)'), 'r' => array('REPORT_EXIT_STATUS' ,'' ,0 ,'exit with status at end of execution'), 's' => array('TEST_PHP_SRCDIR' ,'path' ,NULL ,'path to php source code'), 't' => array('TEST_PHP_DETAILED' ,'number' ,0 ,'level of detail output to dump'), diff --git a/win32/build/template.rc b/win32/build/template.rc index ed2b83332a..f26c98009d 100644 --- a/win32/build/template.rc +++ b/win32/build/template.rc @@ -1,7 +1,7 @@ /* This is a template RC file. * Do not edit with MSVC */ #ifdef APSTUDIO_INVOKED -# error dont edit with MSVC +# error Do not edit with MSVC #endif #include "winresrc.h" |