mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-02 13:38:48 +00:00
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:
parent
d00a34d7e6
commit
0d262638e3
3 changed files with 14 additions and 4 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>
|
2008-07-28 Jan Schmidt <jan.schmidt@sun.com>
|
||||||
|
|
||||||
* configure.ac:
|
* configure.ac:
|
||||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit e79879859bc866545379eb77e1378a906dc30ebf
|
Subproject commit d70ca17ae6fbe6020996e4567275d5e14972ed45
|
|
@ -703,9 +703,11 @@ gst_soup_http_src_finished_cb (SoupMessage * msg, GstSoupHTTPSrc * src)
|
||||||
src->ret = GST_FLOW_CUSTOM_ERROR;
|
src->ret = GST_FLOW_CUSTOM_ERROR;
|
||||||
} else if (G_UNLIKELY (src->session_io_status !=
|
} else if (G_UNLIKELY (src->session_io_status !=
|
||||||
GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING)) {
|
GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING)) {
|
||||||
GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
|
if (msg->status_code != SOUP_STATUS_CANCELLED) {
|
||||||
("%s", msg->reason_phrase),
|
GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,
|
||||||
("libsoup status code %d", msg->status_code));
|
("%s", msg->reason_phrase),
|
||||||
|
("libsoup status code %d", msg->status_code));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (src->loop)
|
if (src->loop)
|
||||||
g_main_loop_quit (src->loop);
|
g_main_loop_quit (src->loop);
|
||||||
|
|
Loading…
Reference in a new issue