aboutsummaryrefslogtreecommitdiff
path: root/httpd.h
diff options
context:
space:
mode:
authorReyk Floeter <reyk@esdenera.com>2014-07-14 14:57:33 +0200
committerReyk Floeter <reyk@esdenera.com>2014-07-14 14:57:33 +0200
commit96f89aa8441368158f5b347b90c13e1acbfdd149 (patch)
tree65f30950345c8e285e8713f64cac68a78db76762 /httpd.h
parent7c427faee432c049aec99ee716dc5c2c0af41f48 (diff)
downloadhttpd-96f89aa8441368158f5b347b90c13e1acbfdd149.tar.gz
httpd-96f89aa8441368158f5b347b90c13e1acbfdd149.zip
sync
Diffstat (limited to 'httpd.h')
-rw-r--r--httpd.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/httpd.h b/httpd.h
index f4ba745..3834e80 100644
--- a/httpd.h
+++ b/httpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: httpd.h,v 1.1 2014/07/12 23:34:54 reyk Exp $ */
+/* $OpenBSD: httpd.h,v 1.3 2014/07/14 00:19:48 reyk Exp $ */
/*
* Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -68,7 +68,8 @@ enum httpchunk {
TOREAD_UNLIMITED = -1,
TOREAD_HTTP_HEADER = -2,
TOREAD_HTTP_CHUNK_LENGTH = -3,
- TOREAD_HTTP_CHUNK_TRAILER = -4
+ TOREAD_HTTP_CHUNK_TRAILER = -4,
+ TOREAD_HTTP_NONE = -5
};
#if DEBUG > 1
@@ -264,6 +265,7 @@ struct client {
struct bufferevent *clt_file;
off_t clt_toread;
+ int clt_persist;
int clt_line;
size_t clt_headerlen;
int clt_done;
@@ -394,11 +396,14 @@ void server_read_httpchunks(struct bufferevent *, void *);
int server_writeheader_kv(struct client *, struct kv *);
int server_writeheader_http(struct client *);
int server_writeresponse_http(struct client *);
+int server_response_http(struct client *, u_int, struct media_type *,
+ size_t);
void server_reset_http(struct client *);
void server_close_http(struct client *);
+int server_response(struct httpd *, struct client *);
/* server_file.c */
-int server_response(struct httpd *, struct client *);
+int server_file(struct httpd *, struct client *);
/* httpd.c */
void event_again(struct event *, int, short,