diff options
| author | Wouter Cloetens <wouter@mind.be> | 2008-08-02 21:39:01 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2008-08-02 21:39:01 +0000 |
| commit | 4223e83f3ccab60d4ac4b41474c40e2d323993ce (patch) | |
| tree | b06fdf5fb6d5e614610b4d1b22993ba7f578d1cd /ext/soup | |
| parent | d0bb024e118bdd06c6b68b5ebfa3b716d1bcadb7 (diff) | |
ext/soup/gstsouphttpsrc.*: Fix seeking race condition in #540300
Original commit message from CVS:
* ext/soup/gstsouphttpsrc.c:
* ext/soup/gstsouphttpsrc.h:
Fix seeking race condition in #540300
Patch By: Wouter Cloetens <wouter at mind be>
Diffstat (limited to 'ext/soup')
| -rw-r--r-- | ext/soup/gstsouphttpsrc.c | 25 | ||||
| -rw-r--r-- | ext/soup/gstsouphttpsrc.h | 1 |
2 files changed, 18 insertions, 8 deletions
diff --git a/ext/soup/gstsouphttpsrc.c b/ext/soup/gstsouphttpsrc.c index 48360ab1..8ecde0d6 100644 --- a/ext/soup/gstsouphttpsrc.c +++ b/ext/soup/gstsouphttpsrc.c @@ -495,8 +495,10 @@ gst_soup_http_src_unicodify (const gchar * str) static void gst_soup_http_src_cancel_message (GstSoupHTTPSrc * src) { - if (src->msg != NULL) + if (src->msg != NULL) { + src->session_io_status = GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_CANCELLED; soup_session_cancel_message (src->session, src->msg, SOUP_STATUS_CANCELLED); + } src->session_io_status = GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_IDLE; src->msg = NULL; } @@ -695,19 +697,21 @@ gst_soup_http_src_finished_cb (SoupMessage * msg, GstSoupHTTPSrc * src) } GST_DEBUG_OBJECT (src, "finished"); src->ret = GST_FLOW_UNEXPECTED; - if (src->session_io_status == GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING && - src->read_position > 0) { + if (src->session_io_status == GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_CANCELLED) { + /* gst_soup_http_src_cancel_message() triggered this; probably a seek + * that occurred in the QUEUEING state; i.e. before the connection setup + * was complete. Do nothing */ + } else if (src->session_io_status == + GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING && src->read_position > 0) { /* The server disconnected while streaming. Reconnect and seeking to the * last location. */ src->retry = TRUE; src->ret = GST_FLOW_CUSTOM_ERROR; } else if (G_UNLIKELY (src->session_io_status != GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING)) { - 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)); - } + 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); @@ -850,6 +854,8 @@ gst_soup_http_src_response_cb (SoupSession * session, SoupMessage * msg, src->retry = TRUE; } else gst_soup_http_src_parse_status (msg, src); + /* The session's SoupMessage object expires after this callback returns. */ + src->msg = NULL; g_main_loop_quit (src->loop); } @@ -993,6 +999,9 @@ gst_soup_http_src_create (GstPushSrc * psrc, GstBuffer ** outbuf) case GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING: gst_soup_http_src_session_unpause_message (src); break; + case GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_CANCELLED: + /* Impossible. */ + break; } if (src->ret == GST_FLOW_CUSTOM_ERROR) diff --git a/ext/soup/gstsouphttpsrc.h b/ext/soup/gstsouphttpsrc.h index f959a4f1..464da340 100644 --- a/ext/soup/gstsouphttpsrc.h +++ b/ext/soup/gstsouphttpsrc.h @@ -42,6 +42,7 @@ typedef enum { GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_IDLE, GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_QUEUED, GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING, + GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_CANCELLED, } GstSoupHTTPSrcSessionIOStatus; struct _GstSoupHTTPSrc { |