ext/soup/gstsouphttpsrc.c: Don't throw an error when soup completes a msg with status 'cancelled', as that indicates ...

Original commit message from CVS:
* ext/soup/gstsouphttpsrc.c:
Don't throw an error when soup completes a msg with status
'cancelled', as that indicates we cancelled a request while
shutting down or seeking, and it's not an error.
Fixes: #540300 again.
This commit is contained in:
Jan Schmidt 2008-07-31 21:26:48 +00:00
parent d00a34d7e6
commit 0d262638e3
3 changed files with 14 additions and 4 deletions

View file

@ -1,3 +1,11 @@
2008-07-31 Jan Schmidt <jan.schmidt@sun.com>
* ext/soup/gstsouphttpsrc.c:
Don't throw an error when soup completes a msg with status
'cancelled', as that indicates we cancelled a request while
shutting down or seeking, and it's not an error.
Fixes: #540300 again.
2008-07-28 Jan Schmidt <jan.schmidt@sun.com>
* configure.ac:

2
common

@ -1 +1 @@
Subproject commit e79879859bc866545379eb77e1378a906dc30ebf
Subproject commit d70ca17ae6fbe6020996e4567275d5e14972ed45

View file

@ -703,9 +703,11 @@ gst_soup_http_src_finished_cb (SoupMessage * msg, GstSoupHTTPSrc * src)
src->ret = GST_FLOW_CUSTOM_ERROR;
} else if (G_UNLIKELY (src->session_io_status !=
GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING)) {
GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
("%s", msg->reason_phrase),
("libsoup status code %d", msg->status_code));
if (msg->status_code != SOUP_STATUS_CANCELLED) {
GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
("%s", msg->reason_phrase),
("libsoup status code %d", msg->status_code));
}
}
if (src->loop)
g_main_loop_quit (src->loop);