diff options
| -rw-r--r-- | README.RELEASE_PROCESS | 2 | ||||
| -rw-r--r-- | ext/fileinfo/tests/magic | 4 | ||||
| -rw-r--r-- | ext/oci8/php_oci8_int.h | 2 | ||||
| -rw-r--r-- | ext/pgsql/php_pgsql.h | 2 | ||||
| -rw-r--r-- | ext/standard/dns_win32.c | 2 | ||||
| -rw-r--r-- | ext/tokenizer/tests/token_get_all_variation14.phpt | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS index 4343b6213c..21305f2993 100644 --- a/README.RELEASE_PROCESS +++ b/README.RELEASE_PROCESS @@ -139,7 +139,7 @@ Rolling a stable release 1. Checkout your release branch, you should have created when releasing previous RC and bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``. -2. If a CVE commit needs to be merged to the release, then have it commited to +2. If a CVE commit needs to be merged to the release, then have it committed to the base branches and merged upwards as usual (f.e commit the CVE fix to 5.3, merge to 5.4, 5.5 etc...). Then you can cherry-pick it in your release branch. Don't forget to update NEWS manually in an extra commit then. diff --git a/ext/fileinfo/tests/magic b/ext/fileinfo/tests/magic index aa75fb65bc..b554333a6c 100644 --- a/ext/fileinfo/tests/magic +++ b/ext/fileinfo/tests/magic @@ -4888,7 +4888,7 @@ >>0 ubyte 0xF5 FoxPro with memo # http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx #>>0 ubyte 0xFA FoxPro 2.x, with memo -# unkown version (should not happen) +# unknown version (should not happen) >>0 default x xBase >>>0 ubyte x (0x%x) # flags in version byte @@ -6115,7 +6115,7 @@ >>>>>379 string GRUB\ \0 \b, GRUB version 0.95 or 0.96 >>>>391 string Geom\0Hard\ Disk\0Read\0\ Error\0 >>>>>385 string GRUB\ \0 \b, GRUB version 0.97 -#unkown version +#unknown version >>>343 string Geom\0Read\0\ Error\0 >>>>321 string Loading\ stage1.5 \b, GRUB version x.y >>>380 string Geom\0Hard\ Disk\0Read\0\ Error\0 diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h index 6671573969..0bc80c3d9c 100644 --- a/ext/oci8/php_oci8_int.h +++ b/ext/oci8/php_oci8_int.h @@ -191,7 +191,7 @@ typedef struct { /* php_oci_statement {{{ */ sword errcode; /* last errcode*/ 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 */ long last_query_len; /* last query length */ HashTable *columns; /* hash containing all the result columns */ HashTable *binds; /* binds hash */ diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h index d6dab56c4c..12d6cfdead 100644 --- a/ext/pgsql/php_pgsql.h +++ b/ext/pgsql/php_pgsql.h @@ -257,7 +257,7 @@ typedef enum _php_pgsql_data_type { PG_PATH, PG_POLYGON, PG_CIRCLE, - /* unkown and system */ + /* unknown and system */ PG_UNKNOWN } php_pgsql_data_type; diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c index 2dbf3e2e1d..a784823dd3 100644 --- a/ext/standard/dns_win32.c +++ b/ext/standard/dns_win32.c @@ -334,7 +334,7 @@ static void php_parserr(PDNS_RECORD pRec, int type_to_fetch, int store, int raw, #endif default: - /* unkown type */ + /* unknown type */ zval_ptr_dtor(subarray); *subarray = NULL; return; diff --git a/ext/tokenizer/tests/token_get_all_variation14.phpt b/ext/tokenizer/tests/token_get_all_variation14.phpt index 5fc390e36c..52d29198c7 100644 --- a/ext/tokenizer/tests/token_get_all_variation14.phpt +++ b/ext/tokenizer/tests/token_get_all_variation14.phpt @@ -26,7 +26,7 @@ struct myStruct { ?>'; var_dump( token_get_all($source)); -// with invalid open tag for testing entire source to be unkown token +// with invalid open tag for testing entire source to be unknown token echo "-- with invlalid PHP open tag & valid tokens --\n"; $source = '<pli echo "hello world"; ?>'; |