diff options
| author |  Patrick Hurst <phurst@mit.edu> | 2014-01-18 18:26:24 -0500 |
|---|---|---|
| committer | Patrick Hurst <phurst@mit.edu> | 2014-01-18 18:26:24 -0500 |
| commit | 4caa5f98146d40715a96aeab6c4ff65e7a0f38b6 (patch) | |
| tree | 96e059e285d059c3c9373fdb081041a72121d767 /src/c/fastcgi.c | |
| parent | 1ce3acd70b3527add32015267cc916e920661dbb (diff) | |
| parent | 6787b686afe5fd3e65b3d377d4c363b4cd086dad (diff) | |
Merge in upstream changes.
Diffstat (limited to 'src/c/fastcgi.c')
| -rw-r--r-- | src/c/fastcgi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/c/fastcgi.c b/src/c/fastcgi.c index 9e3c8d7e..5c80d3ae 100644 --- a/src/c/fastcgi.c +++ b/src/c/fastcgi.c @@ -632,10 +632,11 @@ void uw_copy_client_data(void *dst, void *src) { } void uw_do_expunge(uw_context ctx, uw_Basis_client cli, void *data) { - if (uw_get_app(ctx)->db_begin(ctx)) - uw_error(ctx, FATAL, "Error running SQL BEGIN"); + uw_ensure_transaction(ctx); uw_get_app(ctx)->expunger(ctx, cli); - uw_commit(ctx); + + if (uw_commit(ctx)) + uw_error(ctx, UNLIMITED_RETRY, "Rerunning expunge transaction"); } void uw_post_expunge(uw_context ctx, void *data) { |