diff options
-rw-r--r-- | ChangeLog | 8 | ||||
m--------- | common | 0 | ||||
-rw-r--r-- | ext/soup/gstsouphttpsrc.c | 8 |
3 files changed, 13 insertions, 3 deletions
@@ -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: diff --git a/common b/common -Subproject e79879859bc866545379eb77e1378a906dc30eb +Subproject d70ca17ae6fbe6020996e4567275d5e14972ed4 diff --git a/ext/soup/gstsouphttpsrc.c b/ext/soup/gstsouphttpsrc.c index d9324f9f..48360ab1 100644 --- a/ext/soup/gstsouphttpsrc.c +++ b/ext/soup/gstsouphttpsrc.c @@ -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); |