summaryrefslogtreecommitdiff
path: root/server_http.c
diff options
context:
space:
mode:
authorReyk Floeter <reyk@esdenera.com>2014-07-13 16:12:59 +0200
committerReyk Floeter <reyk@esdenera.com>2014-07-13 16:12:59 +0200
commitb0a1cfbe755d14e21af5e866fc7321cf6a3c8d0b (patch)
tree948585fe33752889c039c67cc1eccd73ec5fa5c8 /server_http.c
parent660b4faa8d41d0817c59d00f8d606daab3586535 (diff)
downloadhttpd-b0a1cfbe755d14e21af5e866fc7321cf6a3c8d0b.tar.gz
httpd-b0a1cfbe755d14e21af5e866fc7321cf6a3c8d0b.zip
Implement media type support
Diffstat (limited to 'server_http.c')
-rw-r--r--server_http.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/server_http.c b/server_http.c
index 9a956c9..674e92b 100644
--- a/server_http.c
+++ b/server_http.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server_http.c,v 1.2 2014/07/12 23:55:35 reyk Exp $ */
+/* $OpenBSD: server_http.c,v 1.3 2014/07/13 09:46:19 beck Exp $ */
/*
* Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -319,7 +319,7 @@ server_read_http(struct bufferevent *bev, void *arg)
done:
if (clt->clt_toread <= 0) {
- if (server_response(clt) == -1)
+ if (server_response(env, clt) == -1)
return;
}
@@ -550,8 +550,14 @@ server_abort_http(struct client *clt, u_int code, const char *msg)
/* A CSS stylesheet allows minimal customization by the user */
style = "body { background-color: white; color: black; font-family: "
- "'Comic Sans MS', 'Chalkboard SE', 'Comic Neue', sans-serif; }";
-
+ "'Comic Sans MS', 'Chalkboard SE', 'Comic Neue', sans-serif; }"
+ "blink { animation:blink 1s; animation-iteration-count: infinite;"
+ "-webkit-animation:blink 1s;"
+ "-webkit-animation-iteration-count: infinite;}"
+ "@keyframes blink { 0%{opacity:0.0;} 50%{opacity:0.0;}"
+ "50.01%{opacity:1.0;} 100%{opacity:1.0;} }"
+ "@-webkit-keyframes blink { 0%{opacity:0.0;} 50%{opacity:0.0;}"
+ "50.01%{opacity:1.0;} 100%{opacity:1.0;} }";
/* Generate simple HTTP+HTML error document */
if (asprintf(&httpmsg,
"HTTP/1.0 %03d %s\r\n"
@@ -568,7 +574,7 @@ server_abort_http(struct client *clt, u_int code, const char *msg)
"<style type=\"text/css\"><!--\n%s\n--></style>\n"
"</head>\n"
"<body>\n"
- "<h1>%s</h1>\n"
+ "<h1><blink>%s</blink></h1>\n"
"<div id='m'>%s</div>\n"
"<hr><address>%s at %s port %d</address>\n"
"</body>\n"