From bb612d4a3100467a0959fa33df7822c2c8f385d8 Mon Sep 17 00:00:00 2001
From: Christoph Michael Becker <cmb@php.net>
Date: Fri, 12 Jan 2018 16:21:05 +0000
Subject: [PATCH] Fix #70952: GD massive memory consumption

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@343821 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/image/book.xml | 7 +++++++
 reference/image/ini.xml  | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/reference/image/book.xml b/reference/image/book.xml
index e0bab94341..d2f6fe4aca 100644
--- a/reference/image/book.xml
+++ b/reference/image/book.xml
@@ -47,6 +47,13 @@
       The <function>getimagesize</function> function does not require the GD extension.
     </simpara>
    </note>
+   <caution>
+    <simpara>
+     While the bundled version of the GD library uses the Zend memory manager to
+     allocate memory, system versions do not, so that <link
+     linkend="ini.memory-limit">memory_limit</link> does not apply. 
+    </simpara>
+   </caution>
   </para>
 
   <para>
diff --git a/reference/image/ini.xml b/reference/image/ini.xml
index f5bccca0b3..4f33d81248 100644
--- a/reference/image/ini.xml
+++ b/reference/image/ini.xml
@@ -74,7 +74,8 @@
  <warning>
   <para>
    Image functions are very memory intensive. Be sure to set <link
-   linkend="ini.memory-limit">memory_limit</link> high enough.
+   linkend="ini.memory-limit">memory_limit</link> high enough, if you are using
+   the bundled version of the GD library.
   </para>
  </warning>
 </section>