From 6188674f1e10c8d72e0a27623ce9536f4706fe35 Mon Sep 17 00:00:00 2001 From: Mats Lindh Date: Sun, 9 Feb 2014 21:17:26 +0200 Subject: [PATCH 1/7] 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 2537fdf0c843a480683c0394f9e231cb8fb289da Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Thu, 13 Feb 2014 23:21:28 +0100 Subject: [PATCH 2/7] mention ldap_modify_batch() --- NEWS | 2 ++ UPGRADING | 1 + 2 files changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 3ffd0e921a0..127655b0603 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,8 @@ PHP NEWS - PCRE: . Upgraded to PCRE 8.34. (Anatol) +- ldap + . Added new function ldap_modify_batch(). (Ondrej Hosek) 23 Jan 2014, PHP 5.6.0 Alpha 1 - CLI server: diff --git a/UPGRADING b/UPGRADING index b04cb4a1c72..9a3e49e7b98 100755 --- a/UPGRADING +++ b/UPGRADING @@ -117,6 +117,7 @@ PHP X.Y UPGRADE NOTES - LDAP: Added ldap_escape($value, $ignore = "", $flags = 0). + Added ldap_modify_batch($link_identifier, $dn, $modifications) described in https://wiki.php.net/rfc/ldap_modify_batch. - Zip: Added ZipArchive::setPassword($password) From 91fecd7673f1d52a7876d7c92cb362bcbd6f16b6 Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Fri, 14 Feb 2014 00:22:31 +0100 Subject: [PATCH 3/7] move the peer verification NEWS entry to the alpha2 block, as it was pushed after alpha1 --- NEWS | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 127655b0603..6f12385a5c6 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,10 @@ PHP NEWS - ldap . Added new function ldap_modify_batch(). (Ondrej Hosek) +- Openssl + . Peer certificates now verified by default in client socket operations + (RFC: https://wiki.php.net/rfc/tls-peer-verification). (Daniel Lowrey) + 23 Jan 2014, PHP 5.6.0 Alpha 1 - CLI server: . Added some MIME types to the CLI web server. (Chris Jones) @@ -84,8 +88,6 @@ PHP NEWS . Peer name verification matches SAN DNS names for certs using the Subject Alternative Name x509 extension. (Daniel Lowrey) . Fixed segfault when built against OpenSSL>=1.0.1 (Daniel Lowrey) - . Peer certificates now verified by default in client socket operations - (RFC: https://wiki.php.net/rfc/tls-peer-verification). (Daniel Lowrey) . Added SPKAC support. (Jason Gerfen) - PDO_pgsql: From 71b8f59ebba9ec3c5af6d4bd0b5e9dab3803dbe5 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Fri, 14 Feb 2014 08:56:21 +0900 Subject: [PATCH 4/7] Update NEWS and UPGRADING --- NEWS | 2 ++ UPGRADING | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/NEWS b/NEWS index 6f12385a5c6..d41a44f4381 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,8 @@ PHP NEWS - Core: . Added T_POW (**) operator (RFC: https://wiki.php.net/rfc/pow-operator). (Tjerk Meesters) + . Implemented unified default encoding + (RFC: https://wiki.php.net/rfc/default_encoding). (Yasuo Ohgaki) - mysqli . Added new function mysqli_get_links_stats() as well as new INI variable diff --git a/UPGRADING b/UPGRADING index 9a3e49e7b98..de12a7388df 100755 --- a/UPGRADING +++ b/UPGRADING @@ -55,6 +55,10 @@ PHP X.Y UPGRADE NOTES - Added T_POW (**) operator. (https://wiki.php.net/rfc/pow-operator) +- Added unified default encoding. default_charset=UTF-8 and functions/extensions + use encoding settings honor default_charset. + (https://wiki.php.net/rfc/default_encoding) + - The php://input stream is now re-usable and can be used concurrently with enable_post_data_reading=0. From 35101e9ef4669bb076f6687f2fd1aa13f63695d0 Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Fri, 14 Feb 2014 14:51:10 +0200 Subject: [PATCH 5/7] 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 = ''; From f9829690d4f6e747a8d46751c9d37e5e5e40336c Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Fri, 14 Feb 2014 17:12:52 +0200 Subject: [PATCH 6/7] a few typofixes --- ext/opcache/tests/opcache-2.blacklist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/opcache/tests/opcache-2.blacklist b/ext/opcache/tests/opcache-2.blacklist index 575d9fab304..4e369bb0735 100644 --- a/ext/opcache/tests/opcache-2.blacklist +++ b/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 From a7ec000f3526076fce684557bee0324a3f8b70ad Mon Sep 17 00:00:00 2001 From: Veres Lajos Date: Fri, 14 Feb 2014 17:16:17 +0200 Subject: [PATCH 7/7] a few typofixes --- ext/mbstring/mbstring.c | 2 +- ext/oci8/php_oci8_int.h | 2 +- sapi/fpm/tests/apparmor.phpt | 4 ++-- sapi/phpdbg/phpdbg_help.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 1ae43602d15..e7f08a32564 100644 --- a/ext/mbstring/mbstring.c +++ b/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; diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h index 9dc9814a47b..5da3ea53346 100644 --- a/ext/oci8/php_oci8_int.h +++ b/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 */ diff --git a/sapi/fpm/tests/apparmor.phpt b/sapi/fpm/tests/apparmor.phpt index cf9bd711181..e0f051998ff 100644 --- a/sapi/fpm/tests/apparmor.phpt +++ b/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--