Merge branch 'PHP-5.6'

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.

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)"

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

ext/mbstring/mbstring.c

@@ -1292,7 +1292,7 @@ int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, uint new_v
 	const mbfl_encoding *encoding;
 
 	if (!new_value || new_value_length == 0 || !(encoding = mbfl_name2encoding(new_value))) {
-		/* falls back to UTF-8 if an unkown encoding name is given */
+		/* falls back to UTF-8 if an unknown encoding name is given */
 		encoding = mbfl_no2encoding(mbfl_no_encoding_utf8);
 	}
 	MBSTRG(internal_encoding) = encoding;

ext/oci8/php_oci8_int.h

@@ -219,7 +219,7 @@ typedef struct {
 	sb4					 errcode;				/* last ORA- error number */
 	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 */
 	char                 impres_flag;           /* PHP_OCI_IMPRES_*_ */
 	long				 last_query_len;		/* last query length */
 	HashTable			*columns;				/* hash containing all the result columns */

ext/opcache/tests/opcache-2.blacklist

@@ -1,5 +1,5 @@
 /path/to/bar
-; wildcard and relative entires
+; wildcard and relative entries
 blacklist.inc
 ./current.php
 /tmp/path/?nocache.inc

ext/pgsql/php_pgsql.h

@@ -260,7 +260,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;
 

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;

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

sapi/fpm/tests/apparmor.phpt

@@ -3,7 +3,7 @@ FPM: Apparmor Test
 --DESCRIPTION--
 This test tries to launches a pool which tries to change to non existing
 apparmor hat a. Test succeeds if apparmor is not running or hat is non
-existant.
+existent.
 --SKIPIF--
 <?php
 include "skipif.inc";
@@ -39,7 +39,7 @@ EOT;
    - failed to change to new confinement
      something in apparmor went wrong
    - exited with code 70
-     Change to successful; Hat not existant (Process gets killed by apparmor)
+     Change to successful; Hat not existent (Process gets killed by apparmor)
  */
 var_dump(run_fpm_till('/(SIGSEGV|failed to query apparmor confinement|failed to change to new confinement|exited with code 70)/', $cfg));
 

sapi/phpdbg/phpdbg_help.c

@@ -268,7 +268,7 @@ PHPDBG_HELP(break) /* {{{ */
 	phpdbg_writeln(EMPTY);
 	phpdbg_writeln("\t%sbreak op ZEND_ADD", phpdbg_get_prompt(TSRMLS_C));
 	phpdbg_writeln("\t%sb O ZEND_ADD", phpdbg_get_prompt(TSRMLS_C));
-	phpdbg_writeln("\tWill break on every occurence of the opcode provided");
+	phpdbg_writeln("\tWill break on every occurrence of the opcode provided");
 	phpdbg_writeln(EMPTY);
 	phpdbg_writeln("\t%sbreak del 1", phpdbg_get_prompt(TSRMLS_C));
 	phpdbg_writeln("\t%sb d 1", phpdbg_get_prompt(TSRMLS_C));
@@ -574,7 +574,7 @@ PHPDBG_HELP(options) /* {{{ */
 	phpdbg_writeln(" -c\t-c/my/php.ini\t\tSet php.ini file to load");
 	phpdbg_writeln(" -d\t-dmemory_limit=4G\tSet a php.ini directive");
 	phpdbg_writeln(" -n\tN/A\t\t\tDisable default php.ini");
-	phpdbg_writeln(" -q\tN/A\t\t\tSupress welcome banner");
+	phpdbg_writeln(" -q\tN/A\t\t\tSuppress welcome banner");
 	phpdbg_writeln(" -e\t-emytest.php\t\tSet execution context");
 	phpdbg_writeln(" -v\tN/A\t\t\tEnable oplog output");
 	phpdbg_writeln(" -s\tN/A\t\t\tEnable stepping");