com php-src: Fix ext/pgsql builds with libpq < 7.3.: NEWS ext/pgsql/pgsql.c
| From: | Adam Harvey | Date: | Tue, 01 Jul 2014 20:19:22 +0000 |
| Subject: | com php-src: Fix ext/pgsql builds with libpq < 7.3.: NEWS ext/pgsql/pgsql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79173@lists.php.net to get a copy of this message | ||
Commit: 899fe3d8af42dc09c3f0ed2915e516c068166a43
Author: Adam Harvey <aharvey@php.net> Tue, 1 Jul 2014 13:19:22 -0700
Parents: 6081dd781aa78f2c6b6497ecba6f8c4b88fc5afb
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=899fe3d8af42dc09c3f0ed2915e516c068166a43
Log:
Fix ext/pgsql builds with libpq < 7.3.
Fixes bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756).
Bugs:
https://bugs.php.net/67550
Changed paths:
M NEWS
M ext/pgsql/pgsql.c
Diff:
diff --git a/NEWS b/NEWS
index 89edf0c..ccc9027 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 c91677c..16ce7bf 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