MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-10 05:59:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use evhttp_connection's closecb instead of our fail_cb extension

Browse Source 
The closecb callback of evhttp_connection does what we need, so no need
to use that extension anymore.
This commit is contained in:
Julien BLACHE
2010-02-14 09:34:29 +01:00
parent b474166e8d
commit 18abda3a97
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/httpd.c
View File

@@ -127,9 +127,7 @@ static pthread_t tid_httpd;
static void
stream_end(struct stream_ctx *st, int failed)
{
/* This is an extension to the stock evhttp */
st->req->fail_cb = NULL;
st->req->fail_cb_arg = NULL;
evhttp_connection_set_closecb(st->req->evcon, NULL, NULL);
if (!failed)
evhttp_send_reply_end(st->req);
@@ -292,7 +290,7 @@ stream_chunk_raw_cb(int fd, short event, void *arg)
}
static void
stream_fail_cb(struct evhttp_request *req, void *arg)
stream_fail_cb(struct evhttp_connection *evcon, void *arg)
{
struct stream_ctx *st;
@@ -583,9 +581,7 @@ httpd_stream_file(struct evhttp_request *req, int id)
}
#endif
/* This is an extension to the stock evhttp */
req->fail_cb = stream_fail_cb;
req->fail_cb_arg = st;
evhttp_connection_set_closecb(req->evcon, stream_fail_cb, st);
DPRINTF(E_INFO, L_HTTPD, "Kicking off streaming for %s\n", mfi->path);