projects
/
m6w6
/
ext-pq
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
a009113
)
remove superfluous error text in pgres errors
author
Michael Wallner
<mike@php.net>
Mon, 21 Jan 2013 17:10:59 +0000
(18:10 +0100)
committer
Michael Wallner
<mike@php.net>
Mon, 21 Jan 2013 17:10:59 +0000
(18:10 +0100)
src/php_pq.c
patch
|
blob
|
history
diff --git
a/src/php_pq.c
b/src/php_pq.c
index ce191b3ca3bf57a4547813f814ac637bc897c5c4..f1db28f16fbf006074b62aee8bafaeb771fe17c1 100644
(file)
--- a/
src/php_pq.c
+++ b/
src/php_pq.c
@@
-799,7
+799,11
@@
static PHP_METHOD(pqconn, poll) {
if (obj->conn) {
if (obj->poller) {
if (obj->conn) {
if (obj->poller) {
- RETURN_LONG(obj->poller(obj->conn));
+ if (obj->poller == PQconsumeInput) {
+ RETURN_LONG(obj->poller(obj->conn) * PGRES_POLLING_OK);
+ } else {
+ RETURN_LONG(obj->poller(obj->conn));
+ }
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No asynchronous operation active");
}
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No asynchronous operation active");
}
@@
-816,7
+820,7
@@
static STATUS php_pqres_success(PGresult *res TSRMLS_DC)
case PGRES_BAD_RESPONSE:
case PGRES_NONFATAL_ERROR:
case PGRES_FATAL_ERROR:
case PGRES_BAD_RESPONSE:
case PGRES_NONFATAL_ERROR:
case PGRES_FATAL_ERROR:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s
: %s", PQresStatus(PQresultStatus(res))
, PQresultErrorMessage(res));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s
"
, PQresultErrorMessage(res));
return FAILURE;
default:
return SUCCESS;
return FAILURE;
default:
return SUCCESS;