rewind_input_plugin: Update MIME not only once

The assumption that MIME type is set only once is not valid with CURL, as URL redirections may update the MIME type. This fixes bug #3044.

rewind_input_plugin: Update MIME not only once
54294366 · Thomas Jansen · Max Kellermann · 4a7abc9d · 54294366 · 54294366
Commit 54294366 authored Sep 22, 2010 by Thomas Jansen Committed by Max Kellermann Sep 23, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

NEWS NEWS +2 -0

rewind_input_plugin.c src/input/rewind_input_plugin.c +4 -3

No files found.
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ ver 0.15.13 (2010/??/??)
 * output_thread: fix race condition after CANCEL command
 * output:
  - httpd: fix random data in stream title
+* input:
+  - rewind: update MIME not only once


 ver 0.15.12 (2010/07/20)

--- a/src/input/rewind_input_plugin.c
+++ b/src/input/rewind_input_plugin.c
@@ -86,10 +86,11 @@ copy_attributes(struct input_stream *dest)
 	dest->size = src->size;
 	dest->offset = src->offset;

-	if (dest->mime == NULL && src->mime != NULL)
-		/* this is set only once, and the duplicated pointer
-		   is freed by input_stream_close() */
+	if (src->mime != NULL) {
+		if (dest->mime != NULL)
+			g_free(dest->mime);
 		dest->mime = g_strdup(src->mime);
+	}
 }

 static void