Merge branch 'PHP-5.5' into PHP-5.6

LawnGnome · LawnGnome · commit d1adf55c15ee · 2014-07-01T13:25:55.000-07:00
* PHP-5.5:
  Fix ext/pgsql builds with libpq &lt; 7.3.
diff --git a/NEWS b/NEWS
@@ -15,6 +15,10 @@ PHP                                                                        NEWS
   . Fix bug #67541 (Fix Apache 2.4.10+ SetHandler proxy:fcgi://
     incompatibilities). (David Zuelke)
 
+- pgsql:
+  . Fix bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756),
+    which affected builds against libpq < 7.3. (Adam)
+
 - phpdbg:
   . Fix Bug #67499 (readline feature not enabled when build with libedit). (Remi)
   . Fix issue krakjoe/phpdbg#94 (List behavior is inconsistent). (Bob)
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
@@ -783,7 +783,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
