summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-07-28 00:38:19 -0700
committerStanislav Malyshev <stas@php.net>2014-07-28 00:38:50 -0700
commitf782ea5b421d4ac04e950f626dcd778ae5ed5e47 (patch)
tree67c219fb369710b2bcfc9a0fe4ce23235327fbc9
parent531be9662f47be89b3ecf9eddc520a5750c4e2a9 (diff)
parent3e167ba990afc1f46739dfed9d4ba42e9389b2f2 (diff)
downloadphp-git-f782ea5b421d4ac04e950f626dcd778ae5ed5e47.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: fix NEWS
-rw-r--r--NEWS6
1 files changed, 3 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index ec794468eb..822dc1ea4e 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,9 @@ PHP NEWS
. Fixed bug #67635 (php links to systemd libraries without using pkg-config).
(pacho@gentoo.org, Remi)
+- OpenSSL:
+ . Fixed missing type checks in OpenSSL options (Yussuf Khalil, Stas).
+
- readline:
. Fixed bug #55496 (Interactive mode doesn't force a newline before the
prompt). (Bob, Johannes)
@@ -18,9 +21,6 @@ PHP NEWS
- Sessions:
. Fixed missing type checks in php_session_create_id (Yussuf Khalil, Stas).
-- OpenSSL:
- . Fixed missing type checks in OpenSSL options (Yussuf Khalil, Stas).
-
24 Jul 2014, PHP 5.5.15
- Core: