mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' into PHP-5.5

Browse Source 
* PHP-5.4:
  Fix ext/pgsql builds with libpq < 7.3.
This commit is contained in:
Adam Harvey 2014-07-01 13:23:11 -07:00
commit 2e02f18b15
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -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)

2
ext/pgsql/pgsql.c
View File

@ -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