summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2007-04-11 22:35:25 +0000
committerAntony Dovgal <tony2001@php.net>2007-04-11 22:35:25 +0000
commit8957f067636d6d498c23ceb917e4d9a4c552c97c (patch)
treec3b08e5a25c7c7a759c2ab2586940e48bb84bd91
parente94b3c8f88fab325bd48666b3ddd2519254eb4b3 (diff)
downloadphp-git-8957f067636d6d498c23ceb917e4d9a4c552c97c.tar.gz
MFB
-rwxr-xr-xZend/tests/bug40770.phpt4
-rw-r--r--ext/date/tests/bug35885.phpt8
2 files changed, 9 insertions, 3 deletions
diff --git a/Zend/tests/bug40770.phpt b/Zend/tests/bug40770.phpt
index fd01303f7f..ce6bbbdaa9 100755
--- a/Zend/tests/bug40770.phpt
+++ b/Zend/tests/bug40770.phpt
@@ -1,7 +1,7 @@
--TEST--
Bug #40770 Apache child exits when PHP memory limit reached
--INI--
-memory_limit=64M
+memory_limit=8M
--FILE--
<?php
ini_set('display_errors',true);
@@ -12,4 +12,4 @@ for ($i=0; $i<=$mb; $i++) {
}
?>
--EXPECTF--
-Fatal error: Allowed memory size of 67108864 bytes exhausted%s(tried to allocate %d bytes) in %sbug40770.php on line 6
+Fatal error: Allowed memory size of 8388608 bytes exhausted%s(tried to allocate %d bytes) in %s on line %d
diff --git a/ext/date/tests/bug35885.phpt b/ext/date/tests/bug35885.phpt
index 5f4e5d58cf..60fc2ca695 100644
--- a/ext/date/tests/bug35885.phpt
+++ b/ext/date/tests/bug35885.phpt
@@ -7,7 +7,13 @@ date_default_timezone_set("UTC");
$ts = date(DATE_ISO8601, strtotime('NOW'));
$ts2 = date(DATE_ISO8601, time());
-var_dump($ts == $ts2);
+$res = ($ts == $ts2);
+var_dump($res);
+
+if (!$res) {
+ var_dump($ts);
+ var_dump($ts2);
+}
?>
--EXPECT--