archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  ext/pgsql: Fix warning not being emittedd when failure to cancel a query
This commit is contained in:
Gina Peter Banyard 2025-05-29 15:44:08 +01:00
commit 2b22ea9630
No known key found for this signature in database
GPG key ID: F30F8C1ACF51943F
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/pgsql/pgsql.c
View file

@ -3887,8 +3887,14 @@ static void php_pgsql_do_async(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
int rc; int rc;
c = PQgetCancel(pgsql); c = PQgetCancel(pgsql);
/* PQcancel
* The return value of PQcancel is 1 if the cancel request was successfully dispatched and 0 if not.
* If not, errbuf is filled with an explanatory error message.
* errbuf must be a char array of size errbufsize (the recommended size is 256 bytes).
* https://www.postgresql.org/docs/current/libpq-cancel.html#LIBPQ-PQCANCEL
*/
RETVAL_LONG((rc = PQcancel(c, err, sizeof(err)))); RETVAL_LONG((rc = PQcancel(c, err, sizeof(err))));
if (rc < 0) { if (rc == 0) {
zend_error(E_WARNING, "cannot cancel the query: %s", err); zend_error(E_WARNING, "cannot cancel the query: %s", err);
} }
while ((pgsql_result = PQgetResult(pgsql))) { while ((pgsql_result = PQgetResult(pgsql))) {