diff options
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 | ||||
| -rw-r--r-- | ext/oci8/php_oci8_int.h | 2 | ||||
| -rw-r--r-- | sapi/fpm/tests/apparmor.phpt | 4 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_help.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 1ae43602d1..e7f08a3256 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -1292,7 +1292,7 @@ int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_v const mbfl_encoding *encoding; if (!new_value || new_value_length == 0 || !(encoding = mbfl_name2encoding(new_value))) { - /* falls back to UTF-8 if an unkown encoding name is given */ + /* falls back to UTF-8 if an unknown encoding name is given */ encoding = mbfl_no2encoding(mbfl_no_encoding_utf8); } MBSTRG(internal_encoding) = encoding; diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h index 9dc9814a47..5da3ea5334 100644 --- a/ext/oci8/php_oci8_int.h +++ b/ext/oci8/php_oci8_int.h @@ -219,7 +219,7 @@ typedef struct { sb4 errcode; /* last ORA- error number */ OCIError *err; /* private error handle */ OCIStmt *stmt; /* statement handle */ - char *last_query; /* last query issued. also used to determine if this is a statement or a refcursor recieved from Oracle */ + char *last_query; /* last query issued. also used to determine if this is a statement or a refcursor received from Oracle */ char impres_flag; /* PHP_OCI_IMPRES_*_ */ long last_query_len; /* last query length */ HashTable *columns; /* hash containing all the result columns */ diff --git a/sapi/fpm/tests/apparmor.phpt b/sapi/fpm/tests/apparmor.phpt index cf9bd71118..e0f051998f 100644 --- a/sapi/fpm/tests/apparmor.phpt +++ b/sapi/fpm/tests/apparmor.phpt @@ -3,7 +3,7 @@ FPM: Apparmor Test --DESCRIPTION-- This test tries to launches a pool which tries to change to non existing apparmor hat a. Test succeeds if apparmor is not running or hat is non -existant. +existent. --SKIPIF-- <?php include "skipif.inc"; @@ -39,7 +39,7 @@ EOT; - failed to change to new confinement something in apparmor went wrong - exited with code 70 - Change to successful; Hat not existant (Process gets killed by apparmor) + Change to successful; Hat not existent (Process gets killed by apparmor) */ var_dump(run_fpm_till('/(SIGSEGV|failed to query apparmor confinement|failed to change to new confinement|exited with code 70)/', $cfg)); diff --git a/sapi/phpdbg/phpdbg_help.c b/sapi/phpdbg/phpdbg_help.c index a02cb41c14..d2fea8d7c7 100644 --- a/sapi/phpdbg/phpdbg_help.c +++ b/sapi/phpdbg/phpdbg_help.c @@ -268,7 +268,7 @@ PHPDBG_HELP(break) /* {{{ */ phpdbg_writeln(EMPTY); phpdbg_writeln("\t%sbreak op ZEND_ADD", phpdbg_get_prompt(TSRMLS_C)); phpdbg_writeln("\t%sb O ZEND_ADD", phpdbg_get_prompt(TSRMLS_C)); - phpdbg_writeln("\tWill break on every occurence of the opcode provided"); + phpdbg_writeln("\tWill break on every occurrence of the opcode provided"); phpdbg_writeln(EMPTY); phpdbg_writeln("\t%sbreak del 1", phpdbg_get_prompt(TSRMLS_C)); phpdbg_writeln("\t%sb d 1", phpdbg_get_prompt(TSRMLS_C)); @@ -574,7 +574,7 @@ PHPDBG_HELP(options) /* {{{ */ phpdbg_writeln(" -c\t-c/my/php.ini\t\tSet php.ini file to load"); phpdbg_writeln(" -d\t-dmemory_limit=4G\tSet a php.ini directive"); phpdbg_writeln(" -n\tN/A\t\t\tDisable default php.ini"); - phpdbg_writeln(" -q\tN/A\t\t\tSupress welcome banner"); + phpdbg_writeln(" -q\tN/A\t\t\tSuppress welcome banner"); phpdbg_writeln(" -e\t-emytest.php\t\tSet execution context"); phpdbg_writeln(" -v\tN/A\t\t\tEnable oplog output"); phpdbg_writeln(" -s\tN/A\t\t\tEnable stepping"); |