diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ext/soup/gstsouphttpsrc.c | 9 |
2 files changed, 16 insertions, 1 deletions
@@ -2,6 +2,14 @@ Patch by: Wouter Cloetens <wouter at mind dot be> + * ext/soup/gstsouphttpsrc.c: (gst_souphttp_src_init): + Let the proxy property default to the content of the $http_proxy + environment variable. + +2008-01-30 Sebastian Dröge <slomo@circular-chaos.org> + + Patch by: Wouter Cloetens <wouter at mind dot be> + * tests/check/test-cert.pem: * tests/check/test-key.pem: Add missing files for the unit test. diff --git a/ext/soup/gstsouphttpsrc.c b/ext/soup/gstsouphttpsrc.c index dff897c6..9cb47933 100644 --- a/ext/soup/gstsouphttpsrc.c +++ b/ext/soup/gstsouphttpsrc.c @@ -277,8 +277,9 @@ gst_souphttp_src_class_init (GstSouphttpSrcClass * klass) static void gst_souphttp_src_init (GstSouphttpSrc * src, GstSouphttpSrcClass * g_class) { + const gchar *proxy; + src->location = NULL; - src->proxy = NULL; src->automatic_redirect = TRUE; src->user_agent = g_strdup (DEFAULT_USER_AGENT); src->icy_caps = NULL; @@ -296,6 +297,12 @@ gst_souphttp_src_init (GstSouphttpSrc * src, GstSouphttpSrcClass * g_class) src->seekable = TRUE; src->read_position = 0; src->request_position = 0; + proxy = g_getenv ("http_proxy"); + if (proxy && !gst_souphttp_src_set_proxy (src, proxy)) { + GST_WARNING_OBJECT (src, + "The proxy in the http_proxy env var (\"%s\") cannot be parsed.", + proxy); + } } static void |