diff options
| author | Christopher Jones <sixd@php.net> | 2012-03-29 17:42:43 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2012-03-29 17:42:43 -0700 |
| commit | c3fd894d0af6e6dd5eb1b7cc27b945e3792f3642 (patch) | |
| tree | 9ef1552509011984dc7e81d7ad5d7da2e9da681e /ext/pgsql/pgsql.c | |
| parent | 2c9d8f1d91eb7ab0542d013e06dd60f8057aaa11 (diff) | |
| parent | babe3ee0d2ba4f6c919bbb6710f232e6ef91e6ac (diff) | |
| download | php-git-c3fd894d0af6e6dd5eb1b7cc27b945e3792f3642.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' 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)
Revert "Merge branch 'pull-request/24'" (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
ext/pcntl/pcntl.c: Fix typo in comment
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 327ce0737a..e54b8243ba 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -4924,7 +4924,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) { @@ -4935,7 +4937,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); |