diff options
| author |  Adam Chlipala <adam@chlipala.net> | 2011-01-20 15:11:45 -0500 |
|---|---|---|
| committer | Adam Chlipala <adam@chlipala.net> | 2011-01-20 15:11:45 -0500 |
| commit | 5e551876d67ac610c2a392acc2417e623002a51e (patch) | |
| tree | 008aed8a59eeb1194b399bb244f7ab66101291c4 /src/c | |
| parent | 376ee602dc967529bd703b5cfe72b2b9dac8dbbd (diff) | |
Some fixes for tasks and onError handlers
Diffstat (limited to 'src/c')
| -rw-r--r-- | src/c/urweb.c | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/src/c/urweb.c b/src/c/urweb.c index 382c9d77..12934509 100644 --- a/src/c/urweb.c +++ b/src/c/urweb.c @@ -728,22 +728,6 @@ failure_kind uw_begin(uw_context ctx, char *path) { return r; } -failure_kind uw_begin_onError(uw_context ctx, char *msg) { - int r = setjmp(ctx->jmp_buf); - - if (ctx->app->on_error) { - if (r == 0) { - if (ctx->app->db_begin(ctx)) - uw_error(ctx, BOUNDED_RETRY, "Error running SQL BEGIN"); - - ctx->app->on_error(ctx, msg); - } - - return r; - } else - uw_error(ctx, FATAL, "Tried to run nonexistent onError handler"); -} - uw_Basis_client uw_Basis_self(uw_context ctx) { if (ctx->client == NULL) uw_error(ctx, FATAL, "Call to Basis.self() from page that has only server-side code"); @@ -3747,3 +3731,25 @@ uw_Basis_time *uw_Basis_readUtc(uw_context ctx, uw_Basis_string s) { else return NULL; } + +static const char begin_xhtml[] = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">"; + +failure_kind uw_begin_onError(uw_context ctx, char *msg) { + int r = setjmp(ctx->jmp_buf); + + if (ctx->app->on_error) { + if (r == 0) { + if (ctx->app->db_begin(ctx)) + uw_error(ctx, BOUNDED_RETRY, "Error running SQL BEGIN"); + + uw_write_header(ctx, "HTTP/1.1 500 Internal Server Error\r\n"); + uw_write_header(ctx, "Content-type: text/html\r\n\r\n"); + uw_write(ctx, begin_xhtml); + ctx->app->on_error(ctx, msg); + uw_write(ctx, "</html>"); + } + + return r; + } else + uw_error(ctx, FATAL, "Tried to run nonexistent onError handler"); +} |