diff options
| author | Anatol Belski <ab@php.net> | 2014-07-02 10:22:09 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-02 10:22:09 +0200 |
| commit | 96783bdfb79b33646dc916d4b93bc33b78d70c4c (patch) | |
| tree | 0a736c2d92178dd8ab12bf2085cb661cedbc4ef6 /ext/pgsql/pgsql.c | |
| parent | 1a50c27f998769c5b3472d35c39852286900db69 (diff) | |
| parent | 122ee0a1cf2b31ae2497fada3900848382fbfb70 (diff) | |
| download | php-git-96783bdfb79b33646dc916d4b93bc33b78d70c4c.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
fix integer overflow in {stream,file}_{get,put}_contents()
add some missing NEWS entries
NEWS block for 5.6.0RC3
Fix ext/pgsql builds with libpq < 7.3.
updated libs_version.txt
updated libs_version.txt
updated libmagic.patch in 5.6+
updated libmagic.patch
Conflicts:
ext/standard/file.c
ext/standard/streamsfuncs.c
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -rw-r--r-- | ext/pgsql/pgsql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 66b43d858d..106e39135a 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -788,7 +788,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 |