mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/neon/gstneonhttpsrc.c: Don't post LIBRARY_INIT errors where we should be posting

Browse source 
Original commit message from CVS:
* ext/neon/gstneonhttpsrc.c: (gst_neonhttp_src_start):
Don't post LIBRARY_INIT errors where we should be posting
RESOURCE OPEN_READ errors. Fixes #552506.
This commit is contained in:
Tim-Philipp Müller 2008-09-17 14:22:38 +00:00
parent 6cc8ef3018
commit 028352c5e0
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-09-17 Tim-Philipp Müller <tim.muller at collabora co uk>
* ext/neon/gstneonhttpsrc.c: (gst_neonhttp_src_start):
Don't post LIBRARY_INIT errors where we should be posting
RESOURCE OPEN_READ errors. Fixes #552506.
2008-09-17 Jan Schmidt <jan.schmidt@sun.com> 2008-09-17 Jan Schmidt <jan.schmidt@sun.com>
* ext/jack/gstjackaudiosink.c: (jack_process_cb): * ext/jack/gstjackaudiosink.c: (jack_process_cb):

19
ext/neon/gstneonhttpsrc.c
View file

@ -496,8 +496,9 @@ gst_neonhttp_src_start (GstBaseSrc * bsrc)
ne_oom_callback (oom_callback); ne_oom_callback (oom_callback);
if (ne_sock_init () != 0) res = ne_sock_init ();
return FALSE; if (res != 0)
goto init_failed;
res = gst_neonhttp_src_send_request_and_redirect (src, res = gst_neonhttp_src_send_request_and_redirect (src,
&src->session, &src->request, 0, src->automatic_redirect); &src->session, &src->request, 0, src->automatic_redirect);
@ -509,7 +510,7 @@ gst_neonhttp_src_start (GstBaseSrc * bsrc)
GST_ERROR_OBJECT (src, "HTTP Request failed when opening socket!"); GST_ERROR_OBJECT (src, "HTTP Request failed when opening socket!");
} }
#endif #endif
goto init_failed; goto socket_error;
} else if (res == HTTP_REQUEST_WRONG_PROXY) { } else if (res == HTTP_REQUEST_WRONG_PROXY) {
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
if (src->neon_http_debug) { if (src->neon_http_debug) {
@ -584,19 +585,25 @@ gst_neonhttp_src_start (GstBaseSrc * bsrc)
/* ERRORS */ /* ERRORS */
init_failed: init_failed:
{ {
GST_ELEMENT_ERROR (src, LIBRARY, INIT, GST_ELEMENT_ERROR (src, LIBRARY, INIT, (NULL),
("ne_sock_init() failed: %d", res));
return FALSE;
}
socket_error:
{
GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
(NULL), ("Could not initialize neon library (%i)", res)); (NULL), ("Could not initialize neon library (%i)", res));
return FALSE; return FALSE;
} }
wrong_proxy: wrong_proxy:
{ {
GST_ELEMENT_ERROR (src, LIBRARY, INIT, GST_ELEMENT_ERROR (src, RESOURCE, SETTINGS,
(NULL), ("Both proxy host and port must be specified or none")); (NULL), ("Both proxy host and port must be specified or none"));
return FALSE; return FALSE;
} }
begin_req_failed: begin_req_failed:
{ {
GST_ELEMENT_ERROR (src, LIBRARY, INIT, GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ,
(NULL), ("Could not begin request (%i)", res)); (NULL), ("Could not begin request (%i)", res));
return FALSE; return FALSE;
} }