From: Rasmus Lerdorf <rasmus@php.net>
Date: Sun, 2 Aug 2009 23:12:04 +0000 (+0000)
Subject: Missed a merge
X-Git-Tag: php-5.2.11RC1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5624073f749386c0fbea53bc444606ade1dea9f3;p=php

Missed a merge
---

diff --git a/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt b/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt
index 8cf54b732a..fd01d83ca1 100755
--- a/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt
+++ b/ext/iconv/tests/ob_iconv_handler-charset-length-cve-2007-4840.phpt
@@ -2,6 +2,8 @@
 ob_iconv_handler() charset parameter length checks (CVE-2007-4840)
 --SKIPIF--
 <?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
+--INI--
+memory_limit=256M
 --FILE--
 <?php
 ini_set("iconv.output_encoding", str_repeat("a", 9000000));