summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2015-09-30 01:35:05 +0200
committerFerenc Kovacs <tyrael@php.net>2015-09-30 01:35:05 +0200
commit2f0d051bfd43315bedfff2de3137abd2c67741a6 (patch)
treeb4402c2bf3308a147afb8c2eaecbb43257111f82
parenta8dfa57571afbe815f213f1fe74ee1f8704e408a (diff)
downloadphp-git-PHP-5.6.14.tar.gz
-rw-r--r--NEWS8
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 10 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 19025e3506..5667a75fb2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-17 Sep 2015, PHP 5.6.14RC1
+01 Oct 2015, PHP 5.6.14
- Core:
. Fixed bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when
@@ -22,10 +22,16 @@ PHP NEWS
DH key resource). (Jakub Zelenka)
. Fixed bug #70395 (Missing ARG_INFO for openssl_seal()). (cmb)
. Fixed bug #60632 (openssl_seal fails with AES). (Jakub Zelenka)
+ . Fixed bug #68312 (Lookup for openssl.cnf causes a message box). (Anatol)
- PDO:
. Fixed bug #70389 (PDO constructor changes unrelated variables). (Laruence)
+- Phar:
+ . Fixed bug #69720 (Null pointer dereference in phar_get_fp_offset()). (Stas)
+ . FIxed bug #70433 (Uninitialized pointer in phar_make_dirstream when zip
+ entry filename is "/"). (Stas)
+
- Phpdbg:
. Fix phpdbg_break_next() sometimes not breaking. (Bob)
diff --git a/configure.in b/configure.in
index a6adc18c0e..19124951cf 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=6
PHP_RELEASE_VERSION=14
-PHP_EXTRA_VERSION="RC1"
+PHP_EXTRA_VERSION=""
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
diff --git a/main/php_version.h b/main/php_version.h
index 7f04994d9e..0e98b6e062 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 6
#define PHP_RELEASE_VERSION 14
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.6.14RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.6.14"
#define PHP_VERSION_ID 50614