Skip to content

Commit 35101e9

Browse files
vlajoskaplanlior
authored andcommitted
a few typofixes
1 parent 6188674 commit 35101e9

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

README.RELEASE_PROCESS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Rolling a stable release
139139
1. Checkout your release branch, you should have created when releasing previous RC
140140
and bump the version numbers in ``main/php_version.h``, ``configure.in`` and possibly ``NEWS``.
141141

142-
2. If a CVE commit needs to be merged to the release, then have it commited to
142+
2. If a CVE commit needs to be merged to the release, then have it committed to
143143
the base branches and merged upwards as usual (f.e commit the CVE fix to 5.3,
144144
merge to 5.4, 5.5 etc...). Then you can cherry-pick it in your release branch.
145145
Don't forget to update NEWS manually in an extra commit then.

ext/fileinfo/tests/magic

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4888,7 +4888,7 @@
48884888
>>0 ubyte 0xF5 FoxPro with memo
48894889
# http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
48904890
#>>0 ubyte 0xFA FoxPro 2.x, with memo
4891-
# unkown version (should not happen)
4891+
# unknown version (should not happen)
48924892
>>0 default x xBase
48934893
>>>0 ubyte x (0x%x)
48944894
# flags in version byte
@@ -6115,7 +6115,7 @@
61156115
>>>>>379 string GRUB\ \0 \b, GRUB version 0.95 or 0.96
61166116
>>>>391 string Geom\0Hard\ Disk\0Read\0\ Error\0
61176117
>>>>>385 string GRUB\ \0 \b, GRUB version 0.97
6118-
#unkown version
6118+
#unknown version
61196119
>>>343 string Geom\0Read\0\ Error\0
61206120
>>>>321 string Loading\ stage1.5 \b, GRUB version x.y
61216121
>>>380 string Geom\0Hard\ Disk\0Read\0\ Error\0

ext/oci8/php_oci8_int.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ typedef struct { /* php_oci_statement {{{ */
191191
sword errcode; /* last errcode*/
192192
OCIError *err; /* private error handle */
193193
OCIStmt *stmt; /* statement handle */
194-
char *last_query; /* last query issued. also used to determine if this is a statement or a refcursor recieved from Oracle */
194+
char *last_query; /* last query issued. also used to determine if this is a statement or a refcursor received from Oracle */
195195
long last_query_len; /* last query length */
196196
HashTable *columns; /* hash containing all the result columns */
197197
HashTable *binds; /* binds hash */

ext/pgsql/php_pgsql.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ typedef enum _php_pgsql_data_type {
257257
PG_PATH,
258258
PG_POLYGON,
259259
PG_CIRCLE,
260-
/* unkown and system */
260+
/* unknown and system */
261261
PG_UNKNOWN
262262
} php_pgsql_data_type;
263263

ext/standard/dns_win32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ static void php_parserr(PDNS_RECORD pRec, int type_to_fetch, int store, int raw,
334334
#endif
335335

336336
default:
337-
/* unkown type */
337+
/* unknown type */
338338
zval_ptr_dtor(subarray);
339339
*subarray = NULL;
340340
return;

ext/tokenizer/tests/token_get_all_variation14.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ struct myStruct {
2626
?>';
2727
var_dump( token_get_all($source));
2828

29-
// with invalid open tag for testing entire source to be unkown token
29+
// with invalid open tag for testing entire source to be unknown token
3030
echo "-- with invlalid PHP open tag & valid tokens --\n";
3131
$source = '<pli
3232
echo "hello world"; ?>';

0 commit comments

Comments
 (0)