diff options
| author | Adam Harvey <aharvey@php.net> | 2014-07-01 13:23:11 -0700 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-07-01 13:23:11 -0700 |
| commit | 2e02f18b154bb00279e5d121cc36beea7b9b8f37 (patch) | |
| tree | 64e19cc0d7b7e362b35f335220fa9d26f64778c9 | |
| parent | 5d687afa890cc6a4a272d42af56b77c279d1e1b3 (diff) | |
| parent | 899fe3d8af42dc09c3f0ed2915e516c068166a43 (diff) | |
| download | php-git-2e02f18b154bb00279e5d121cc36beea7b9b8f37.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix ext/pgsql builds with libpq < 7.3.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/pgsql/pgsql.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -17,6 +17,10 @@ PHP NEWS - FPM: . Fix bug #67531 (syslog cannot be set in pool configuration). (Remi) +- pgsql: + . Fix bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756), + which affected builds against libpq < 7.3. (Adam) + - Streams: . Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam) diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index be915ae5ae..e2b417ea2c 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -753,7 +753,7 @@ static int le_link, le_plink, le_result, le_lofp, le_string; #endif #if !HAVE_PQESCAPE_CONN -#define PQescapeStringConn(conn, to, form, len, error) PQescapeString(to, from, len) +#define PQescapeStringConn(conn, to, from, len, error) PQescapeString(to, from, len) #endif #if HAVE_PQESCAPELITERAL |