php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-25 00:32:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed bug #49985 (pdo_pgsql prepare() re-use previous aborted transaction).

Browse Source
This commit is contained in:
Ilia Alshanetsky
2009-10-26 02:02:28 +00:00
parent 70e8b40fc7
commit 42626ae6fa
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -13,6 +13,8 @@ PHP NEWS
- Fixed bug #49990 (SNMP3 warning message about security level printed twice).
(Jani)
- Fixed bug #49985 (pdo_pgsql prepare() re-use previous aborted
transaction). (ben dot pineau at gmail dot com, Ilia)
- Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia,
sjoerd at php dot net)
- Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning).

20
ext/pdo_pgsql/pgsql_statement.c
View File

@@ -162,6 +162,14 @@ static int pgsql_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC)
/* using a prepared statement */
if (!S->is_prepared) {
/* don't break the whole current transaction when the first
* prepare tentative fails (happens when the prepared statement
* already exists). ignore those SAVEPOINT queries results because
* we don't care (may be outside transaction?).
*/
char buf[100]; /* stmt_name == "pdo_pgsql_cursor_%08x" */
snprintf(buf, sizeof(buf), "SAVEPOINT %s", S->stmt_name);
PQexec(H->server, buf);
stmt_retry:
/* we deferred the prepare until now, because we didn't
* know anything about the parameter types; now we do */
@@ -181,12 +189,14 @@ stmt_retry:
/* 42P05 means that the prepared statement already existed. this can happen if you use
* a connection pooling software line pgpool which doesn't close the db-connection once
* php disconnects. if php dies (no chance to run RSHUTDOWN) during execution it has no
* chance to DEALLOCATE the prepared statements it has created. so, if we hit a 42P05 we
* deallocate it and retry ONCE (thies 2005.12.15)
* chance to DEALLOCATE the prepared statements it has created. Also happens if we tried
* to DEALLOCATE the same statement name in an aborted transaction. so, if we hit a 42P05
* we deallocate it and retry ONCE (thies 2005.12.15)
*/
if (!strcmp(sqlstate, "42P05")) {
char buf[100]; /* stmt_name == "pdo_crsr_%016lx" */
PGresult *res;
snprintf(buf, sizeof(buf), "ROLLBACK TO SAVEPOINT %s", S->stmt_name);
PQexec(H->server, buf);
snprintf(buf, sizeof(buf), "DEALLOCATE %s", S->stmt_name);
res = PQexec(H->server, buf);
if (res) {
@@ -194,11 +204,15 @@ stmt_retry:
}
goto stmt_retry;
} else {
snprintf(buf, sizeof(buf), "RELEASE SAVEPOINT %s", S->stmt_name);
PQexec(H->server, buf);
pdo_pgsql_error_stmt(stmt, status, sqlstate);
return 0;
}
}
}
snprintf(buf, sizeof(buf), "RELEASE SAVEPOINT %s", S->stmt_name);
PQexec(H->server, buf);
}
S->result = PQexecPrepared(H->server, S->stmt_name,
stmt->bound_params ?