archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

a few typofixes

Browse source
This commit is contained in:
Veres Lajos 2014-02-14 14:51:10 +02:00 • committed by Lior Kaplan
parent 6188674f1e
commit 35101e9ef4
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.RELEASE_PROCESS
View file

@ -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.

4
ext/fileinfo/tests/magic
View file

@ -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

2
ext/oci8/php_oci8_int.h
View file

@ -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 */

2
ext/pgsql/php_pgsql.h
View file

@ -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;

2
ext/standard/dns_win32.c
View file

@ -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;

2
ext/tokenizer/tests/token_get_all_variation14.phpt
View file

@ -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"; ?>';