Skip to content

Commit

Permalink
a few typofixes
Browse files Browse the repository at this point in the history
  • Loading branch information
vlajos authored and kaplanlior committed Feb 14, 2014
1 parent 6188674 commit 35101e9
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.RELEASE_PROCESS
Expand Up @@ -139,7 +139,7 @@ Rolling a stable release
1. Checkout your release branch, you should have created when releasing previous RC 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``. 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, 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. 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. Don't forget to update NEWS manually in an extra commit then.
Expand Down
4 changes: 2 additions & 2 deletions ext/fileinfo/tests/magic
Expand Up @@ -4888,7 +4888,7 @@
>>0 ubyte 0xF5 FoxPro with memo >>0 ubyte 0xF5 FoxPro with memo
# http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx # http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
#>>0 ubyte 0xFA FoxPro 2.x, with memo #>>0 ubyte 0xFA FoxPro 2.x, with memo
# unkown version (should not happen) # unknown version (should not happen)
>>0 default x xBase >>0 default x xBase
>>>0 ubyte x (0x%x) >>>0 ubyte x (0x%x)
# flags in version byte # flags in version byte
Expand Down Expand Up @@ -6115,7 +6115,7 @@
>>>>>379 string GRUB\ \0 \b, GRUB version 0.95 or 0.96 >>>>>379 string GRUB\ \0 \b, GRUB version 0.95 or 0.96
>>>>391 string Geom\0Hard\ Disk\0Read\0\ Error\0 >>>>391 string Geom\0Hard\ Disk\0Read\0\ Error\0
>>>>>385 string GRUB\ \0 \b, GRUB version 0.97 >>>>>385 string GRUB\ \0 \b, GRUB version 0.97
#unkown version #unknown version
>>>343 string Geom\0Read\0\ Error\0 >>>343 string Geom\0Read\0\ Error\0
>>>>321 string Loading\ stage1.5 \b, GRUB version x.y >>>>321 string Loading\ stage1.5 \b, GRUB version x.y
>>>380 string Geom\0Hard\ Disk\0Read\0\ Error\0 >>>380 string Geom\0Hard\ Disk\0Read\0\ Error\0
Expand Down
2 changes: 1 addition & 1 deletion ext/oci8/php_oci8_int.h
Expand Up @@ -191,7 +191,7 @@ typedef struct { /* php_oci_statement {{{ */
sword errcode; /* last errcode*/ sword errcode; /* last errcode*/
OCIError *err; /* private error handle */ OCIError *err; /* private error handle */
OCIStmt *stmt; /* statement 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 */ long last_query_len; /* last query length */
HashTable *columns; /* hash containing all the result columns */ HashTable *columns; /* hash containing all the result columns */
HashTable *binds; /* binds hash */ HashTable *binds; /* binds hash */
Expand Down
2 changes: 1 addition & 1 deletion ext/pgsql/php_pgsql.h
Expand Up @@ -257,7 +257,7 @@ typedef enum _php_pgsql_data_type {
PG_PATH, PG_PATH,
PG_POLYGON, PG_POLYGON,
PG_CIRCLE, PG_CIRCLE,
/* unkown and system */ /* unknown and system */
PG_UNKNOWN PG_UNKNOWN
} php_pgsql_data_type; } php_pgsql_data_type;


Expand Down
2 changes: 1 addition & 1 deletion ext/standard/dns_win32.c
Expand Up @@ -334,7 +334,7 @@ static void php_parserr(PDNS_RECORD pRec, int type_to_fetch, int store, int raw,
#endif #endif


default: default:
/* unkown type */ /* unknown type */
zval_ptr_dtor(subarray); zval_ptr_dtor(subarray);
*subarray = NULL; *subarray = NULL;
return; return;
Expand Down
2 changes: 1 addition & 1 deletion ext/tokenizer/tests/token_get_all_variation14.phpt
Expand Up @@ -26,7 +26,7 @@ struct myStruct {
?>'; ?>';
var_dump( token_get_all($source)); 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"; echo "-- with invlalid PHP open tag & valid tokens --\n";
$source = '<pli $source = '<pli
echo "hello world"; ?>'; echo "hello world"; ?>';
Expand Down

0 comments on commit 35101e9

Please sign in to comment.