Commit 6010cac2 authored by W. Michael Petullo's avatar W. Michael Petullo

Fix Content-Type, based on iTunes', and corrupt DPAP thumb. in dmapd+DmapdDMAPDbDisk

Signed-off-by: W. Michael Petullo's avatarW. Michael Petullo <>
parent 03b72850
19 November 2010 W. Michael Petullo <>
* 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 <>
* Fix problem sharing to iTunes due to incorrect Content-Length
......@@ -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);
......@@ -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: */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment