[totem/gnome-2-28] Error when resolving redirect URIs

[Bastien Nocera <hadess src gnome org>]

commit 455daf535e773e58f50f8abd3c2745c83fd3c970
Author: Simon Pecher <simon pecher googlemail com>
Date:   Mon Nov 16 13:06:37 2009 +0000

    Error when resolving redirect URIs
    
    If the plugin-viewer gets a redirect to an absolute URL it may corrupt
    the redirect-URL by trying to append it to either "emb->stream_uri",
    "emb->current_uri" or "emb->base_uri" by calling "resolve_redirect". I suppose
    absolute URLs should not be processed any further by "resolve_redirect",
    should they?
    
    Appending an else after the first if-statement may solve this issue.
    
    (The error occured while I tried to watch wmv videos on
    http://www.3sat.de/mediathek/mediathek.php)
    
    https://bugzilla.gnome.org/show_bug.cgi?id=600852

 browser-plugin/totem-plugin-viewer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c
index 6d02d07..392f3d7 100644
--- a/browser-plugin/totem-plugin-viewer.c
+++ b/browser-plugin/totem-plugin-viewer.c
@@ -1298,7 +1298,7 @@ on_got_redirect (GtkWidget *bvw, const char *mrl, TotemEmbedded *emb)
 	if (strstr (mrl, "://") != NULL)
 		new_uri = NULL;
 	/* We are using a local cache, so we resolve against the stream_uri */
-	if (emb->stream_uri)
+	else if (emb->stream_uri)
 		new_uri = resolve_redirect (emb->stream_uri, mrl);
 	/* We don't have a local cache, so resolve against the URI */
 	else if (emb->current_uri)