oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

httpd_output: clear the client's page queue on cancel

Browse Source 
When the httpd output is cancelled, it freed all pages, but didn't
remove them from the queue.  Call g_queue_clear() and remove the
write source id.
This commit is contained in:
Max Kellermann 2009-03-15 19:06:10 +01:00
parent 50c2dde5b5
commit 58844aabac
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/output/httpd_client.c
View File

@ -409,13 +409,24 @@ httpd_client_queue_size(const struct httpd_client *client)
return size; return size;
} }
/* g_queue_clear() was introduced in GLib 2.14 */
#if !GLIB_CHECK_VERSION(2,14,0)
#define g_queue_clear(q) do { g_queue_free(q); q = g_queue_new(); } while (0)
#endif
void void
httpd_client_cancel(const struct httpd_client *client) httpd_client_cancel(struct httpd_client *client)
{ {
if (client->state != RESPONSE) if (client->state != RESPONSE)
return; return;
g_queue_foreach(client->pages, httpd_client_unref_page, NULL); g_queue_foreach(client->pages, httpd_client_unref_page, NULL);
g_queue_clear(client->pages);
if (client->write_source_id != 0 && client->current_page == NULL) {
g_source_remove(client->write_source_id);
client->write_source_id = 0;
}
} }
static GIOStatus static GIOStatus

2
src/output/httpd_client.h
View File

@ -54,7 +54,7 @@ httpd_client_queue_size(const struct httpd_client *client);
* Clears the page queue. * Clears the page queue.
*/ */
void void
httpd_client_cancel(const struct httpd_client *client); httpd_client_cancel(struct httpd_client *client);
/** /**
* Appends a page to the client's queue. * Appends a page to the client's queue.