[vlc-commits] httplive: support absolute URI-locations for key-retrieval

Ilkka Ollakka git at videolan.org
Sun Mar 17 16:12:14 CET 2013


vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun Mar 17 13:26:33 2013 +0200| [90ea97f7971bb4737856d890da2fbad54106cb58] | committer: Ilkka Ollakka

httplive: support absolute URI-locations for key-retrieval

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=90ea97f7971bb4737856d890da2fbad54106cb58
---

 modules/stream_filter/httplive.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index d6ee0a9..1e39733 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -775,7 +775,13 @@ static int parse_Key(stream_t *s, hls_stream_t *hls, char *p_read)
             if (end != NULL)
                 *end = 0;
         }
-        hls->psz_current_key_path = relative_URI(hls->url, uri);
+        /* For absolute URI, just duplicate it
+         * don't limit to HTTP, maybe some sanity checking
+         * should be done more in here? */
+        if( strstr( uri , "://" ) )
+            hls->psz_current_key_path = strdup( uri );
+        else
+            hls->psz_current_key_path = relative_URI(hls->url, uri);
         free(value);
 
         value = iv = parse_Attributes(p_read, "IV");



More information about the vlc-commits mailing list