diff src/c/fastcgi.c @ 1979:81bc76aa4acd

Merge in upstream changes.
author Patrick Hurst <phurst@mit.edu>
date Sat, 18 Jan 2014 18:26:24 -0500
parents 9f3597979e98
children c93fbd139732
line wrap: on
line diff
--- a/src/c/fastcgi.c	Mon Dec 09 20:41:24 2013 -0500
+++ b/src/c/fastcgi.c	Sat Jan 18 18:26:24 2014 -0500
@@ -632,10 +632,11 @@
 }
 
 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) {