[libdmapsharing] Fix Content-Type, based on iTunes', and corrupt DPAP thumb. in dmapd+DmapdDMAPDbDisk Signed-off-by:
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing] Fix Content-Type, based on iTunes', and corrupt DPAP thumb. in dmapd+DmapdDMAPDbDisk Signed-off-by:
- Date: Sat, 20 Nov 2010 07:03:48 +0000 (UTC)
commit 6010cac298b18bffcb42fd273a6a9be3c7082506
Author: W. Michael Petullo <mike flyn org>
Date: Sat Nov 20 01:00:45 2010 -0600
Fix Content-Type, based on iTunes', and corrupt DPAP thumb. in dmapd+DmapdDMAPDbDisk
Signed-off-by: W. Michael Petullo <mike flyn org>
ChangeLog | 10 ++++++++++
libdmapsharing/daap-share.c | 2 +-
libdmapsharing/dmap-share.c | 4 ++--
3 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f674df6..20c5eed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+19 November 2010 W. Michael Petullo <mike flyn org>
+
+ * Change Content-Type to consistently be application/x-dmap-tagged
+ after getting a bug report from Michael Miceli. I confirmed that
+ iTunes uses this content type (not application/x-daap-tagged)
+ when sharing music.
+
+ * Move over-anxious g_object_unref in _dmap_share_databases that
+ resulted in corrupt DPAP thumbnails when using DmapdDMAPDbDisk.
+
18 November 2010 W. Michael Petullo <mike flyn org>
* Fix problem sharing to iTunes due to incorrect Content-Length
diff --git a/libdmapsharing/daap-share.c b/libdmapsharing/daap-share.c
index bfc64f3..903f587 100644
--- a/libdmapsharing/daap-share.c
+++ b/libdmapsharing/daap-share.c
@@ -534,7 +534,7 @@ send_chunked_file (SoupServer *server, SoupMessage *message, DAAPRecord *record,
}
soup_message_headers_append (message->response_headers, "Connection", "Close");
- soup_message_headers_append (message->response_headers, "Content-Type", "application/x-daap-tagged");
+ soup_message_headers_append (message->response_headers, "Content-Type", "application/x-dmap-tagged");
g_signal_connect (message, "wrote_headers", G_CALLBACK (write_next_chunk), cd);
g_signal_connect (message, "wrote_chunk", G_CALLBACK (write_next_chunk), cd);
diff --git a/libdmapsharing/dmap-share.c b/libdmapsharing/dmap-share.c
index a7a5740..5043460 100644
--- a/libdmapsharing/dmap-share.c
+++ b/libdmapsharing/dmap-share.c
@@ -1717,8 +1717,8 @@ _dmap_share_databases (DMAPShare *share,
/* NOTE: still uses old technique: */
mb.mlcl = dmap_structure_add (adbs, DMAP_CC_MLCL); // Was shared with else before
g_hash_table_foreach (records, (GHFunc) DMAP_SHARE_GET_CLASS (share)->add_entry_to_mlcl, &mb);
- g_hash_table_destroy (records);
_dmap_share_message_set_from_dmap_structure (share, message, adbs); // Was shared with else before
+ g_hash_table_destroy (records);
dmap_structure_destroy (adbs); // Was shared with else before
} else {
/* NOTE:
@@ -1756,7 +1756,7 @@ _dmap_share_databases (DMAPShare *share,
/* Free memory after each chunk sent out over network. */
soup_message_body_set_accumulate (message->response_body, FALSE);
- soup_message_headers_append (message->response_headers, "Content-Type", "application/x-daap-tagged");
+ soup_message_headers_append (message->response_headers, "Content-Type", "application/x-dmap-tagged");
DMAP_SHARE_GET_CLASS (share)->message_add_standard_headers (share, message);
/* 4: */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]