diff options
| author | Davey Shafik <me@daveyshafik.com> | 2016-11-30 15:05:54 -0800 |
|---|---|---|
| committer | Davey Shafik <me@daveyshafik.com> | 2016-11-30 15:05:54 -0800 |
| commit | be556555cc4f41798a880fde52920f0b29518fd7 (patch) | |
| tree | 03a75f73c5ea6da5989f4aeca3078fc64ade1020 /ext/pgsql/pgsql.c | |
| parent | 9efea0c23eb0bd8f92c97cc39954fd3cdb366e8b (diff) | |
| parent | e89a0535a3d8f2a09e3b28c3e70d7181819d6ec5 (diff) | |
| download | php-git-be556555cc4f41798a880fde52920f0b29518fd7.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.1.0
* PHP-7.1: (64 commits)
Update NEWS for the build
Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on).
Fixed calling generators through magic __call()
add NEWS
Fix #73549: Use after free when stream is passed to imagepng
Update UPGRADING with info about AEAD changes in openssl_(en|de)crypt
Do not add extra timeval entropy when OpenSSL 1.1 used
Clean up and fix php_openssl_dh_pub_from_priv
Fix occasionaly failing test
Added missing array key to $JUNIT
acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS.
Add more mbfl string size checks (bug #73505)
Add more mbfl string size checks (bug #73505)
Fix #73612: preg_*() may leak memory
Fix more size_t/int implicit conversions
Fix int/size_t confusion in isValidPharFilename (bug #73580)
Fix more size_t/int implicit conversions
Fix #73582: Failing ext/gd/tests/imagettftext_charmap_order.phpt
Fix int/size_t confusion in isValidPharFilename (bug #73580)
add test for bug #57547
...
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -rw-r--r-- | ext/pgsql/pgsql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 43b32fd2ad..5198cb2a94 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -4135,7 +4135,7 @@ PHP_FUNCTION(pg_copy_to) free_pg_null = 1; } - spprintf(&query, 0, "COPY %s TO STDOUT DELIMITERS E'%c' WITH NULL AS E'%s'", table_name, *pg_delim, pg_null_as); + spprintf(&query, 0, "COPY %s TO STDOUT DELIMITER E'%c' NULL AS E'%s'", table_name, *pg_delim, pg_null_as); while ((pgsql_result = PQgetResult(pgsql))) { PQclear(pgsql_result); @@ -4268,7 +4268,7 @@ PHP_FUNCTION(pg_copy_from) pg_null_as_free = 1; } - spprintf(&query, 0, "COPY %s FROM STDIN DELIMITERS E'%c' WITH NULL AS E'%s'", table_name, *pg_delim, pg_null_as); + spprintf(&query, 0, "COPY %s FROM STDIN DELIMITER E'%c' NULL AS E'%s'", table_name, *pg_delim, pg_null_as); while ((pgsql_result = PQgetResult(pgsql))) { PQclear(pgsql_result); } |