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

Use httpd_send_reply() instead of evhttp_send_reply() where pertinent

Browse Source 
gzip replies where useful; artwork should not be compressed, as PNGs are
already compressed and that would be a waste of time.
This commit is contained in:
Julien BLACHE
2010-05-03 18:19:41 +02:00
parent 13c9de3ed1
commit 548cd2a150
3 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/httpd_daap.c
View File

@@ -1041,7 +1041,7 @@ daap_reply_server_info(struct evhttp_request *req, struct evbuffer *evbuf, char
if (supports_update) if (supports_update)
dmap_add_char(evbuf, "msup", 0); /* 9 */ dmap_add_char(evbuf, "msup", 0); /* 9 */
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
} }
static void static void
@@ -1080,7 +1080,7 @@ daap_reply_content_codes(struct evhttp_request *req, struct evbuffer *evbuf, cha
dmap_add_short(evbuf, "mcty", df->type); /* 10 */ dmap_add_short(evbuf, "mcty", df->type); /* 10 */
} }
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
} }
static void static void
@@ -1149,7 +1149,7 @@ daap_reply_login(struct evhttp_request *req, struct evbuffer *evbuf, char **uri,
dmap_add_int(evbuf, "mstt", 200); /* 12 */ dmap_add_int(evbuf, "mstt", 200); /* 12 */
dmap_add_int(evbuf, "mlid", s->id); /* 12 */ dmap_add_int(evbuf, "mlid", s->id); /* 12 */
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
} }
static void static void
@@ -1163,7 +1163,7 @@ daap_reply_logout(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
daap_session_kill(s); daap_session_kill(s);
evhttp_send_reply(req, 204, "Logout Successful", evbuf); httpd_send_reply(req, 204, "Logout Successful", evbuf);
} }
static void static void
@@ -1214,7 +1214,7 @@ daap_reply_update(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
dmap_add_int(evbuf, "mstt", 200); /* 12 */ dmap_add_int(evbuf, "mstt", 200); /* 12 */
dmap_add_int(evbuf, "musr", current_rev); /* 12 */ dmap_add_int(evbuf, "musr", current_rev); /* 12 */
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
return; return;
} }
@@ -1292,7 +1292,7 @@ daap_reply_dblist(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
count = db_pl_get_count(); count = db_pl_get_count();
dmap_add_int(evbuf, "mctc", count); /* 12 */ dmap_add_int(evbuf, "mctc", count); /* 12 */
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
} }
static void static void
@@ -1609,7 +1609,7 @@ daap_reply_songlist_generic(struct evhttp_request *req, struct evbuffer *evbuf,
return; return;
} }
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
return; return;
@@ -1885,7 +1885,7 @@ daap_reply_playlists(struct evhttp_request *req, struct evbuffer *evbuf, char **
return; return;
} }
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
return; return;
@@ -2109,7 +2109,7 @@ daap_reply_groups(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
return; return;
} }
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
return; return;
@@ -2254,7 +2254,7 @@ daap_reply_browse(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
return; return;
} }
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
} }
/* NOTE: We only handle artwork at the moment */ /* NOTE: We only handle artwork at the moment */
@@ -2334,6 +2334,7 @@ daap_reply_extra_data(struct evhttp_request *req, struct evbuffer *evbuf, char *
snprintf(clen, sizeof(clen), "%ld", (long)EVBUFFER_LENGTH(evbuf)); snprintf(clen, sizeof(clen), "%ld", (long)EVBUFFER_LENGTH(evbuf));
evhttp_add_header(req->output_headers, "Content-Length", clen); evhttp_add_header(req->output_headers, "Content-Length", clen);
/* No gzip compression for artwork */
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); evhttp_send_reply(req, HTTP_OK, "OK", evbuf);
return; return;

15
src/httpd_dacp.c
View File

@@ -321,7 +321,7 @@ playstatusupdate_cb(int fd, short what, void *arg)
evbuffer_add(evbuf, EVBUFFER_DATA(update), EVBUFFER_LENGTH(update)); evbuffer_add(evbuf, EVBUFFER_DATA(update), EVBUFFER_LENGTH(update));
evhttp_send_reply(ur->req, HTTP_OK, "OK", evbuf); httpd_send_reply(ur->req, HTTP_OK, "OK", evbuf);
free(ur); free(ur);
} }
@@ -631,7 +631,7 @@ dacp_reply_ctrlint(struct evhttp_request *req, struct evbuffer *evbuf, char **ur
dmap_add_char(evbuf, "casu", 1); /* 9 */ dmap_add_char(evbuf, "casu", 1); /* 9 */
dmap_add_char(evbuf, "ceSG", 1); /* 9 */ dmap_add_char(evbuf, "ceSG", 1); /* 9 */
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
} }
static void static void
@@ -697,7 +697,7 @@ dacp_reply_cue_play(struct evhttp_request *req, struct evbuffer *evbuf, char **u
dmap_add_int(evbuf, "mstt", 200); /* 12 */ dmap_add_int(evbuf, "mstt", 200); /* 12 */
dmap_add_int(evbuf, "miid", id); /* 12 */ dmap_add_int(evbuf, "miid", id); /* 12 */
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
} }
static void static void
@@ -713,7 +713,7 @@ dacp_reply_cue_clear(struct evhttp_request *req, struct evbuffer *evbuf, char **
dmap_add_int(evbuf, "mstt", 200); /* 12 */ dmap_add_int(evbuf, "mstt", 200); /* 12 */
dmap_add_int(evbuf, "miid", 0); /* 12 */ dmap_add_int(evbuf, "miid", 0); /* 12 */
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
} }
static void static void
@@ -932,7 +932,7 @@ dacp_reply_playstatusupdate(struct evhttp_request *req, struct evbuffer *evbuf,
if (ret < 0) if (ret < 0)
evhttp_send_error(req, 500, "Internal Server Error"); evhttp_send_error(req, 500, "Internal Server Error");
else else
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
return; return;
} }
@@ -1027,6 +1027,7 @@ dacp_reply_nowplayingartwork(struct evhttp_request *req, struct evbuffer *evbuf,
snprintf(clen, sizeof(clen), "%ld", (long)EVBUFFER_LENGTH(evbuf)); snprintf(clen, sizeof(clen), "%ld", (long)EVBUFFER_LENGTH(evbuf));
evhttp_add_header(req->output_headers, "Content-Length", clen); evhttp_add_header(req->output_headers, "Content-Length", clen);
/* No gzip compression for artwork */
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); evhttp_send_reply(req, HTTP_OK, "OK", evbuf);
return; return;
@@ -1128,7 +1129,7 @@ dacp_reply_getproperty(struct evhttp_request *req, struct evbuffer *evbuf, char
return; return;
} }
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
return; return;
@@ -1235,7 +1236,7 @@ dacp_reply_getspeakers(struct evhttp_request *req, struct evbuffer *evbuf, char
evbuffer_free(spklist); evbuffer_free(spklist);
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
} }
static void static void

8
src/httpd_rsp.c
View File

@@ -328,7 +328,7 @@ rsp_reply_info(struct evhttp_request *req, char **uri, struct evkeyvalq *query)
evhttp_add_header(req->output_headers, "Content-Type", "text/xml; charset=utf-8"); evhttp_add_header(req->output_headers, "Content-Type", "text/xml; charset=utf-8");
evhttp_add_header(req->output_headers, "Connection", "close"); evhttp_add_header(req->output_headers, "Connection", "close");
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
evbuffer_free(evbuf); evbuffer_free(evbuf);
} }
@@ -434,7 +434,7 @@ rsp_reply_db(struct evhttp_request *req, char **uri, struct evkeyvalq *query)
evhttp_add_header(req->output_headers, "Content-Type", "text/xml; charset=utf-8"); evhttp_add_header(req->output_headers, "Content-Type", "text/xml; charset=utf-8");
evhttp_add_header(req->output_headers, "Connection", "close"); evhttp_add_header(req->output_headers, "Connection", "close");
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
evbuffer_free(evbuf); evbuffer_free(evbuf);
} }
@@ -629,7 +629,7 @@ rsp_reply_playlist(struct evhttp_request *req, char **uri, struct evkeyvalq *que
evhttp_add_header(req->output_headers, "Content-Type", "text/xml; charset=utf-8"); evhttp_add_header(req->output_headers, "Content-Type", "text/xml; charset=utf-8");
evhttp_add_header(req->output_headers, "Connection", "close"); evhttp_add_header(req->output_headers, "Connection", "close");
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
evbuffer_free(evbuf); evbuffer_free(evbuf);
} }
@@ -759,7 +759,7 @@ rsp_reply_browse(struct evhttp_request *req, char **uri, struct evkeyvalq *query
evhttp_add_header(req->output_headers, "Content-Type", "text/xml; charset=utf-8"); evhttp_add_header(req->output_headers, "Content-Type", "text/xml; charset=utf-8");
evhttp_add_header(req->output_headers, "Connection", "close"); evhttp_add_header(req->output_headers, "Connection", "close");
evhttp_send_reply(req, HTTP_OK, "OK", evbuf); httpd_send_reply(req, HTTP_OK, "OK", evbuf);
evbuffer_free(evbuf); evbuffer_free(evbuf);
} }