Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug61115-1.phpt for debug build version.
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
  • Loading branch information...
commit babe3ee0d2ba4f6c919bbb6710f232e6ef91e6ac 2 parents 48033ed + c02aa08
@conf conf authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  ext/standard/tests/streams/bug61115-1.phpt
View
2  ext/standard/tests/streams/bug61115-1.phpt
@@ -8,4 +8,4 @@ stream_context_get_options($fileResourceTemp);
ftruncate($fileResourceTemp, PHP_INT_MAX);
?>
--EXPECTF--
-Fatal error: Allowed memory size of %d bytes exhausted (tried to allocate %d bytes) in %s on line %d
+Fatal error: Allowed memory size of %d bytes exhausted %s (tried to allocate %d bytes) in %s on line %d
Please sign in to comment.
Something went wrong with that request. Please try again.