summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2010-06-14 08:12:10 +0000
committerPierre Joye <pajoye@php.net>2010-06-14 08:12:10 +0000
commitd652e02235aaafee2c2bf9709413c088480f8c41 (patch)
tree422db1b3f1892f6c514546ddbc1f96e7287fa42b
parent205775507af864aa81eac0e4d67fd2fffd4c50be (diff)
downloadphp-git-d652e02235aaafee2c2bf9709413c088480f8c41.tar.gz
- #52043,GD doesn't recognize latest libJPEG version
-rw-r--r--NEWS2
-rw-r--r--ext/gd/libgd/gd_jpeg.c9
2 files changed, 11 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index e2c8a35c66..32c4be8ebd 100644
--- a/NEWS
+++ b/NEWS
@@ -71,6 +71,8 @@ PHP NEWS
requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
- Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas)
+- Fixed bug #52043 (GD doesn't recognize latest libJPEG versions).
+ (php at group dot apple dot com, Pierre)
- Fixed bug #52060 (Memory leak when passing a closure to method_exists()).
(Felipe)
- Fixed bug #52057 (ReflectionClass fails on Closure class). (Felipe)
diff --git a/ext/gd/libgd/gd_jpeg.c b/ext/gd/libgd/gd_jpeg.c
index 0d9bae151c..4f811c7d96 100644
--- a/ext/gd/libgd/gd_jpeg.c
+++ b/ext/gd/libgd/gd_jpeg.c
@@ -113,6 +113,15 @@ const char * gdJpegGetVersionString()
case 62:
return "6b";
break;
+
+ case 70:
+ return "7";
+ break;
+
+ case 80:
+ return "8";
+ break;
+
default:
return "unknown";
}