summaryrefslogtreecommitdiff
path: root/UPGRADING
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2015-06-10 10:49:51 +0200
committerFerenc Kovacs <tyrael@php.net>2015-06-10 10:49:51 +0200
commitdbf30365aa15b9044d75b8f77db570bf8fdf2726 (patch)
treee0b4481c39b2852b91037b38fa0ee5ec3776b52b /UPGRADING
parent9cb8cb47975b044bbaafd2d12287ff52cdd3b0e9 (diff)
parent5ff259ebb72c1f5cef45c235ca1a85b8e1523835 (diff)
downloadphp-git-php-7.0.0alpha1.tar.gz
Merge remote-tracking branch 'origin/master' into PHP-7.0.0php-7.0.0alpha1
* origin/master: add missing NEWS entries add missing NEWS entries Fixed bug #69646 (OS command injection vulnerability in escapeshellarg) add NEWS Fixed bug #68776 fix test update NEWS fix typo Fix bug #69646 OS command injection vulnerability in escapeshellarg Fix #69719 - more checks for nulls in paths fix test description Fixed Buf #68812 Unchecked return value.
Diffstat (limited to 'UPGRADING')
-rw-r--r--UPGRADING2
1 files changed, 1 insertions, 1 deletions
diff --git a/UPGRADING b/UPGRADING
index d539a056ce..69265c8377 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -663,7 +663,7 @@ out, that the corresponding SDK isn't available anymore.
. ZLIB_FINISH
- GD
- . T1Lib support removed, thrus lifting the optional dependency on T1Lib, the
+ . T1Lib support removed, thus lifting the optional dependency on T1Lib, the
following is therefore not available anymore:
Functions: