From 8449e0ca89d77fb20ac3326a0cf574ae2d13676c Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Thu, 29 Mar 2012 19:48:58 +0900 Subject: [PATCH 1/2] Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less) --- ext/pgsql/pgsql.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index ebc17a39e53..4a9294464ac 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -4807,7 +4807,9 @@ PHP_FUNCTION(pg_get_notify) #else if (atof(PG_VERSION) >= 9.0) { #endif +#if HAVE_PQPARAMETERSTATUS add_index_string(return_value, 2, pgsql_notify->extra, 1); +#endif } } if (result_type & PGSQL_ASSOC) { @@ -4818,7 +4820,9 @@ PHP_FUNCTION(pg_get_notify) #else if (atof(PG_VERSION) >= 9.0) { #endif +#if HAVE_PQPARAMETERSTATUS add_assoc_string(return_value, "payload", pgsql_notify->extra, 1); +#endif } } PQfreemem(pgsql_notify); From e1352b04165142c945d1fc98c0bcd0b85c3f659d Mon Sep 17 00:00:00 2001 From: Shein Alexey Date: Thu, 29 Mar 2012 16:51:45 +0500 Subject: [PATCH 2/2] Fixed bug61115-1.phpt for debug build version. --- ext/standard/tests/streams/bug61115-1.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt index 43c54b49742..573496edf0e 100644 --- a/ext/standard/tests/streams/bug61115-1.phpt +++ b/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 at %s:%d (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