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

More DAAP cache adjustments

Browse Source
This commit is contained in:
ejurgensen
2014-08-21 23:06:52 +02:00
parent eac718ea0f
commit f997aca452
3 changed files with 89 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/httpd_daap.c
View File

@@ -1262,7 +1262,8 @@ daap_reply_songlist_generic(struct evhttp_request *req, struct evbuffer *evbuf,
memset(&qp, 0, sizeof(struct query_params));
get_query_params(query, &sort_headers, &qp);
if (playlist == -1)
if (req && (playlist == -1))
user_agent_filter(s->user_agent, &qp);
sctx = NULL;
@@ -1722,13 +1723,15 @@ daap_reply_groups(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
char *tag;
s = daap_session_find(req, query, evbuf);
if (!s)
if (!s && req)
return -1;
memset(&qp, 0, sizeof(struct query_params));
get_query_params(query, &sort_headers, &qp);
user_agent_filter(s->user_agent, &qp);
if (req)
user_agent_filter(s->user_agent, &qp);
param = evhttp_find_header(query, "group-type");
if (strcmp(param, "artists") == 0)
@@ -1978,7 +1981,8 @@ daap_reply_groups(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
}
}
httpd_send_reply(req, HTTP_OK, "OK", evbuf);
if (req)
httpd_send_reply(req, HTTP_OK, "OK", evbuf);
return 0;
@@ -2664,10 +2668,6 @@ daap_request(struct evhttp_request *req)
evhttp_add_header(headers, "Content-Type", "application/x-dmap-tagged");
// Try the cache
ptr = strstr(full_uri, "&session-id");
if (ptr)
*ptr = '\0';
evbuf = daapcache_get(full_uri);
if (evbuf)
{
@@ -2680,9 +2680,6 @@ daap_request(struct evhttp_request *req)
return;
}
if (ptr)
*ptr = '&';
// No cache, so prepare handler arguments and send to the handler
evbuf = evbuffer_new();
if (!evbuf)