From: Adam Harvey <aharvey@php.net>
Date: Tue, 1 Jul 2014 20:19:22 +0000 (-0700)
Subject: Fix ext/pgsql builds with libpq < 7.3.
X-Git-Tag: php-5.5.15RC1~28^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=899fe3d8af42dc09c3f0ed2915e516c068166a43;p=php

Fix ext/pgsql builds with libpq < 7.3.

Fixes bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756).
---

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