summaryrefslogtreecommitdiffstats
path: root/ext/soup
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2008-07-31 21:26:48 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2008-07-31 21:26:48 +0000
commit0d262638e3a3a910d7e7cf2942117c4e15bb2dda (patch)
tree99d0d0658e76b3d2d3f5e005fb30207f87d5b69b /ext/soup
parentd00a34d7e628e8b15f1c2dbd8eb022f1fa88c63f (diff)
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.
Diffstat (limited to 'ext/soup')
-rw-r--r--ext/soup/gstsouphttpsrc.c8
1 files changed, 5 insertions, 3 deletions
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);