summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Harvey <aharvey@php.net>2014-07-01 13:19:22 -0700
committerAdam Harvey <aharvey@php.net>2014-07-01 13:19:22 -0700
commit899fe3d8af42dc09c3f0ed2915e516c068166a43 (patch)
tree479996369eee3637d7ab1ea0df44d3d385253914
parent6081dd781aa78f2c6b6497ecba6f8c4b88fc5afb (diff)
downloadphp-git-899fe3d8af42dc09c3f0ed2915e516c068166a43.tar.gz
Fix ext/pgsql builds with libpq < 7.3.
Fixes bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756).
-rw-r--r--NEWS4
-rw-r--r--ext/pgsql/pgsql.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 89edf0c32c..ccc90277ba 100644
--- a/NEWS
+++ b/NEWS
@@ -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 c91677c961..16ce7bfb7f 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