From 7f12f71f94fd0f29a00f0e4d2b2cd09247cb0908 Mon Sep 17 00:00:00 2001 From: Mukund Sivaraman Date: Mon, 14 Jul 2008 15:31:14 +0530 Subject: Add error number as a template parameter for error pages --- doc/debug.html | 6 +++--- doc/default.html | 6 +++--- src/html-error.c | 14 ++++++++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/doc/debug.html b/doc/debug.html index 72d89c9..6ee3367 100644 --- a/doc/debug.html +++ b/doc/debug.html @@ -4,15 +4,15 @@ -{cause} +{errno} {cause} -

HTTP proxy error

{cause}

The following error has occured at the HTTP proxy: {detail}

{detail}

Here are the error variables:

diff --git a/doc/default.html b/doc/default.html index 0245254..67354b7 100644 --- a/doc/default.html +++ b/doc/default.html @@ -4,15 +4,15 @@ -{cause} +{errno} {cause} -

HTTP proxy error

{cause}

The following error has occured at the HTTP proxy: {detail}

{detail}

diff --git a/src/html-error.c b/src/html-error.c index 6f4fd9e..860e424 100644 --- a/src/html-error.c +++ b/src/html-error.c @@ -248,20 +248,26 @@ add_error_variable(struct conn_s *connptr, char *key, char *val) int add_standard_vars(struct conn_s *connptr) { + char errnobuf[16]; char timebuf[30]; - time_t global_time = time(NULL); + time_t global_time; - strftime(timebuf, sizeof(timebuf), "%a, %d %b %Y %H:%M:%S GMT", - gmtime(&global_time)); + snprintf(errnobuf, sizeof errnobuf, "%d", connptr->error_number); + ADD_VAR_RET("errno", errnobuf); - ADD_VAR_RET("request", connptr->request_line); ADD_VAR_RET("cause", connptr->error_string); + ADD_VAR_RET("request", connptr->request_line); ADD_VAR_RET("clientip", connptr->client_ip_addr); ADD_VAR_RET("clienthost", connptr->client_string_addr); ADD_VAR_RET("version", VERSION); ADD_VAR_RET("package", PACKAGE); ADD_VAR_RET("website", "http://tinyproxy.banu.com/"); + + global_time = time(NULL); + strftime(timebuf, sizeof(timebuf), "%a, %d %b %Y %H:%M:%S GMT", + gmtime(&global_time)); ADD_VAR_RET("date", timebuf); + return (0); } -- cgit v1.2.3