From 6188674f1e10c8d72e0a27623ce9536f4706fe35 Mon Sep 17 00:00:00 2001 From: Mats Lindh Date: Sun, 9 Feb 2014 21:17:26 +0200 Subject: [PATCH 1/2] Replace old SVN references to Git --- build/buildcheck.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 8754e3a292a..8ff3531825f 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -33,14 +33,14 @@ ac_version=`$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' if test -z "$ac_version"; then echo "buildconf: autoconf not found." echo " You need autoconf version 2.59 or newer installed" -echo " to build PHP from SVN." +echo " to build PHP from Git." exit 1 fi IFS=.; set $ac_version; IFS=' ' if test "$1" = "2" -a "$2" -lt "59" || test "$1" -lt "2"; then echo "buildconf: autoconf version $ac_version found." echo " You need autoconf version 2.59 or newer installed" -echo " to build PHP from SVN." +echo " to build PHP from Git." exit 1 else echo "buildconf: autoconf version $ac_version (ok)" From 35101e9ef4669bb076f6687f2fd1aa13f63695d0 Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Fri, 14 Feb 2014 14:51:10 +0200 Subject: [PATCH 2/2] a few typofixes --- README.RELEASE_PROCESS | 2 +- ext/fileinfo/tests/magic | 4 ++-- ext/oci8/php_oci8_int.h | 2 +- ext/pgsql/php_pgsql.h | 2 +- ext/standard/dns_win32.c | 2 +- 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 4343b6213c1..21305f29934 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 aa75fb65bc1..b554333a6cf 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 66715739697..0bc80c3d9ce 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 d6dab56c4c4..12d6cfdead4 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 2dbf3e2e1da..a784823dd37 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 5fc390e36ca..52d29198c7f 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 = '';