mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-20 06:08:14 +00:00
Code Issues 1 Projects Releases Wiki Activity

souphttpsrc: always ignore HEAD errors

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=704241
This commit is contained in:
Arnaud Vrac 2013-07-12 20:01:42 +02:00 committed by Sebastian Dröge
parent ef4a21253b
commit e67655608c
1 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
ext/soup/gstsouphttpsrc.c
View file

@ -1116,44 +1116,43 @@ gst_soup_http_src_response_cb (SoupSession * session, SoupMessage * msg,
static void static void
gst_soup_http_src_parse_status (SoupMessage * msg, GstSoupHTTPSrc * src) gst_soup_http_src_parse_status (SoupMessage * msg, GstSoupHTTPSrc * src)
{ {
if (SOUP_STATUS_IS_TRANSPORT_ERROR (msg->status_code)) { if (msg->method == SOUP_METHOD_HEAD) {
if (msg->method == SOUP_METHOD_HEAD) { if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code))
GST_DEBUG_OBJECT (src, "Ignoring error %d during HEAD request", GST_DEBUG_OBJECT (src, "Ignoring error %d during HEAD request",
msg->status_code); msg->status_code);
} else { } else if (SOUP_STATUS_IS_TRANSPORT_ERROR (msg->status_code)) {
switch (msg->status_code) { switch (msg->status_code) {
case SOUP_STATUS_CANT_RESOLVE: case SOUP_STATUS_CANT_RESOLVE:
case SOUP_STATUS_CANT_RESOLVE_PROXY: case SOUP_STATUS_CANT_RESOLVE_PROXY:
SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, NOT_FOUND, SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, NOT_FOUND,
_("Could not resolve server name.")); _("Could not resolve server name."));
src->ret = GST_FLOW_ERROR; src->ret = GST_FLOW_ERROR;
break; break;
case SOUP_STATUS_CANT_CONNECT: case SOUP_STATUS_CANT_CONNECT:
case SOUP_STATUS_CANT_CONNECT_PROXY: case SOUP_STATUS_CANT_CONNECT_PROXY:
SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, OPEN_READ, SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, OPEN_READ,
_("Could not establish connection to server.")); _("Could not establish connection to server."));
src->ret = GST_FLOW_ERROR; src->ret = GST_FLOW_ERROR;
break; break;
case SOUP_STATUS_SSL_FAILED: case SOUP_STATUS_SSL_FAILED:
SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, OPEN_READ, SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, OPEN_READ,
_("Secure connection setup failed.")); _("Secure connection setup failed."));
src->ret = GST_FLOW_ERROR; src->ret = GST_FLOW_ERROR;
break; break;
case SOUP_STATUS_IO_ERROR: case SOUP_STATUS_IO_ERROR:
SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, READ, SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, READ,
_("A network error occured, or the server closed the connection " _("A network error occured, or the server closed the connection "
"unexpectedly.")); "unexpectedly."));
src->ret = GST_FLOW_ERROR; src->ret = GST_FLOW_ERROR;
break; break;
case SOUP_STATUS_MALFORMED: case SOUP_STATUS_MALFORMED:
SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, READ, SOUP_HTTP_SRC_ERROR (src, msg, RESOURCE, READ,
_("Server sent bad data.")); _("Server sent bad data."));
src->ret = GST_FLOW_ERROR; src->ret = GST_FLOW_ERROR;
break; break;
case SOUP_STATUS_CANCELLED: case SOUP_STATUS_CANCELLED:
/* No error message when interrupted by program. */ /* No error message when interrupted by program. */
break; break;
}
} }
} else if (SOUP_STATUS_IS_CLIENT_ERROR (msg->status_code) || } else if (SOUP_STATUS_IS_CLIENT_ERROR (msg->status_code) ||
SOUP_STATUS_IS_REDIRECTION (msg->status_code) || SOUP_STATUS_IS_REDIRECTION (msg->status_code) ||