diff options
Diffstat (limited to 'httpd.c')
| -rw-r--r-- | httpd.c | 22 |
1 files changed, 12 insertions, 10 deletions
@@ -612,17 +612,19 @@ void httpd_connection(FILE *f) status = HTTP_STATUS_NOT_FOUND; } - if (status == HTTP_STATUS_FORBIDDEN) - body = xs_str_new("<h1>403 Forbidden (" USER_AGENT ")</h1>"); + if (body == NULL) { + if (status == HTTP_STATUS_FORBIDDEN) + body = xs_str_new("<h1>403 Forbidden (" USER_AGENT ")</h1>"); - if (status == HTTP_STATUS_NOT_FOUND) - body = xs_str_new("<h1>404 Not Found (" USER_AGENT ")</h1>"); + if (status == HTTP_STATUS_NOT_FOUND) + body = xs_str_new("<h1>404 Not Found (" USER_AGENT ")</h1>"); - if (status == HTTP_STATUS_GONE) - body = xs_str_new("<h1>410 Gone (" USER_AGENT ")</h1>"); + if (status == HTTP_STATUS_GONE) + body = xs_str_new("<h1>410 Gone (" USER_AGENT ")</h1>"); - if (status == HTTP_STATUS_BAD_REQUEST && body != NULL) - body = xs_str_new("<h1>400 Bad Request (" USER_AGENT ")</h1>"); + if (status == HTTP_STATUS_BAD_REQUEST) + body = xs_str_new("<h1>400 Bad Request (" USER_AGENT ")</h1>"); + } if (status == HTTP_STATUS_SEE_OTHER) headers = xs_dict_append(headers, "location", body); @@ -1077,8 +1079,8 @@ void httpd(void) signal(SIGTERM, term_handler); signal(SIGINT, term_handler); - srv_log(xs_fmt("httpd%s start %s %s", p_state->use_fcgi ? " (FastCGI)" : "", - full_address, USER_AGENT)); + srv_log(xs_fmt(USER_AGENT " httpd%s start %s", p_state->use_fcgi ? " (FastCGI)" : "", + full_address)); /* show the number of usable file descriptors */ struct rlimit r; |