diff options
| author | Christopher Jones <sixd@php.net> | 2012-03-29 17:42:40 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-03-29 17:42:40 -0700 |
| commit | 06235747b17b3f5709604c8d6f12770905a28fcc (patch) | |
| tree | f731d2b64cec00416e4828ac0b29536ad9bd661f /ext/pgsql/pgsql.c | |
| parent | 4b72d505ae54fe3f2a7106c755f985ad9ee7baa5 (diff) | |
| parent | c02aa086c6d075e765d75476b05fa3df3da68c13 (diff) | |
| download | php-git-06235747b17b3f5709604c8d6f12770905a28fcc.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Fixed bug61115-1.phpt for debug build version.
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
This will be PHP 5.3.12
ext/pcntl/pcntl.c: Fix typo in comment
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
ext/pcntl/pcntl.c: Fix typo in comment
ext/pcntl/pcntl.c: Fix typo in comment
- fix bug #61541, Segfault when using ob_* in output_callback
- fix bug #61541, Segfault when using ob_* in output_callback
update NEWS
fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
open_basedir check for linkinfo
NEWS entry for readline fix
NEWS entry for readline fix
Add open_basedir checks to readline_write_history and readline_read_history
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -rw-r--r-- | ext/pgsql/pgsql.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 5702fe2032..d8127af8c1 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -4787,7 +4787,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) { @@ -4798,7 +4800,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); |