24750 2009-03-22 14:12:23 -0700 [GTK] requests download instead of displaying page 2009-03-30 09:35:38 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED http://lhv.delfi.ee/news/index.cfm?id=1146314 Gtk, Soup P2 Normal --- 1 gustavo gustavo oldest_to_newest 114724 0 gustavo 2009-03-22 14:12:23 -0700 This was initially reported in Epiphany's bug tracker: http://bugzilla.gnome.org/show_bug.cgi?id=576267. When the server sends to or more different Content-Type headers, webkit will request that the page be downloaded instead of displaying it: wget -S -O /dev/null 'http://lhv.delfi.ee/news/index.cfm?id=1146314' --2009-03-22 11:16:44-- http://lhv.delfi.ee/news/index.cfm?id=1146314 Resolving lhv.delfi.ee... 90.190.151.34 Connecting to lhv.delfi.ee|90.190.151.34|:80... connected. HTTP request sent, awaiting response... HTTP/1.1 200 OK Connection: close Date: Sun, 22 Mar 2009 14:16:51 GMT Server: Microsoft-IIS/6.0 Content-type: text/html Page-Completion-Status: Normal Expires: -1 Content-Type: text/html; charset=windows-1257 Page-Completion-Status: Normal Set-Cookie: CFID=45627684; path=/; Set-Cookie: CFTOKEN=52268372; path=/; Set-Cookie: LOG_CLIENT_ID=35258851; expires=Sun, 27-Sep-2037 00:00:00 GMT; path=/; This is caused by the fact that libsoup will concatenate all instances of the header, and WebCore doesn't like that. 114728 1 28840 gustavo 2009-03-22 15:15:55 -0700 Created attachment 28840 proposed fix 115115 2 28840 zecke 2009-03-25 00:23:46 -0700 Comment on attachment 28840 proposed fix > - String contentType = soup_message_headers_get(msg->response_headers, "Content-Type"); > + GHashTable *contentTypeParameters = 0; style, '*' pleaced wrongly. > + if (!contentType.isEmpty() && contentType.find(",", 0)) { > + Vector<String> contentTypes; > + contentType.split(',', contentTypes); > + contentType = contentTypes[0]; > + } Interesting question. What is faster... searching the string twice or creating the Vector? > + > + if (contentTypeParameters) { > + GHashTableIter hashTableIter; > + gpointer hashKey; > + gpointer hashValue; > + > + g_hash_table_iter_init(&hashTableIter, contentTypeParameters); > + while (g_hash_table_iter_next(&hashTableIter, &hashKey, &hashValue)) { > + contentType += "; "; > + contentType += static_cast<char*>(hashKey); > + contentType += "="; > + contentType += static_cast<char*>(hashValue); > + } You could consider using StringBuilder here. And another thing. With HTTP headers are like ASCII which makes your use of String(char*) okay, but maybe write String() around it as well to highlight that we really want this. 115143 3 gustavo 2009-03-25 08:11:55 -0700 Landed as r41975. (In reply to comment #2) > > + if (!contentType.isEmpty() && contentType.find(",", 0)) { > > + Vector<String> contentTypes; > > + contentType.split(',', contentTypes); > > + contentType = contentTypes[0]; > > + } > > Interesting question. What is faster... searching the string twice or creating > the Vector? I've gone with creating the Vector. Since split already works correctly, and doesn't do much more than checking if a , exists in the string, I believe this is the way to go. > > + while (g_hash_table_iter_next(&hashTableIter, &hashKey, &hashValue)) { > > + contentType += "; "; > > + contentType += static_cast<char*>(hashKey); > > + contentType += "="; > > + contentType += static_cast<char*>(hashValue); > > + } > > You could consider using StringBuilder here. And another thing. With HTTP > headers are like ASCII which makes your use of String(char*) okay, but maybe > write String() around it as well to highlight that we really want this. I have added the String()'s, but since I am not sure of the advantages of using StringBuilder here, when compared to simply using the + operator, I have left that out for the time being. Thanks! 115214 4 28944 gustavo 2009-03-25 13:46:23 -0700 Created attachment 28944 use soup facilities to append parameters to the content type WebCore/ChangeLog | 10 ++++++++++ .../platform/network/soup/ResourceHandleSoup.cpp | 10 ++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) 115215 5 28944 gustavo 2009-03-25 13:53:47 -0700 Comment on attachment 28944 use soup facilities to append parameters to the content type danw noticed that my work-around is not robust enough for parameters with spaces in their values; this patch uses the libsoup facilities, which handle these cases correctly, to append the parameters 115216 6 gustavo 2009-03-25 13:55:21 -0700 Reopening bug because I posted a new, related patch. 115797 7 28944 zecke 2009-03-30 06:08:02 -0700 Comment on attachment 28944 use soup facilities to append parameters to the content type Okay, didn't know this method, nice cleanup. 115827 8 gustavo 2009-03-30 09:35:38 -0700 Landed as r42106. 28840 2009-03-22 15:15:55 -0700 2009-03-25 13:54:36 -0700 proposed fix multi-content-type.patch text/plain 3750 gustavo RnJvbSA5MGRlOWNhNzI4NmU5NDZjZmZjYmExZGMwYWY0MWNiNmY0MzcyMGM3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGtvdkBrb3YuZXRpLmJy PgpEYXRlOiBTdW4sIDIyIE1hciAyMDA5IDE4OjU5OjExIC0wMzAwClN1YmplY3Q6IFtQQVRDSF0g MjAwOS0wMy0yMiAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z25zQGdub21lLm9yZz4KCiAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDc1MAogICAgICAgIFtHVEtdIHJlcXVlc3RzIGRvd25s b2FkIGluc3RlYWQgb2YgZGlzcGxheWluZyBwYWdlCgogICAgICAgIEhhbmRsZSBDb250ZW50LVR5 cGUgaGVhZGVycyB3ZSBnZXQgZnJvbSBzb3VwLCBzbyB0aGF0IHdlIHNldCBhCiAgICAgICAgcHJv cGVyIG1lZGlhIHR5cGUgb24gdGhlIFJlc291cmNlUmVzcG9uc2UuCgogICAgICAgICogcGxhdGZv cm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CiAgICAgICAgKFdlYkNvcmU6 OmZpbGxSZXNwb25zZUZyb21NZXNzYWdlKToKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTMgKysrKysrKysKIC4uLi9wbGF0Zm9ybS9u ZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCAgIHwgICAzMiArKysrKysrKysrKysr KysrKystCiAyIGZpbGVzIGNoYW5nZWQsIDQzIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCBkYjk2OGRhLi4yYjlkYmIzIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDA5LTAzLTIyICBHdXN0YXZvIE5v cm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNDc1MAorICAgICAgICBbR1RLXSByZXF1ZXN0cyBkb3dubG9hZCBpbnN0ZWFkIG9mIGRp c3BsYXlpbmcgcGFnZQorCisgICAgICAgIEhhbmRsZSBDb250ZW50LVR5cGUgaGVhZGVycyB3ZSBn ZXQgZnJvbSBzb3VwLCBzbyB0aGF0IHdlIHNldCBhCisgICAgICAgIHByb3BlciBtZWRpYSB0eXBl IG9uIHRoZSBSZXNvdXJjZVJlc3BvbnNlLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9z b3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmaWxsUmVzcG9u c2VGcm9tTWVzc2FnZSk6CisKIDIwMDktMDMtMjEgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAg Yi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCmlu ZGV4IGIyYjk4MWIuLmJkYWI4ZmQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAtMTU5LDExICsxNTksMzkgQEAgc3Rh dGljIHZvaWQgZmlsbFJlc3BvbnNlRnJvbU1lc3NhZ2UoU291cE1lc3NhZ2UqIG1zZywgUmVzb3Vy Y2VSZXNwb25zZSogcmVzcG9uc2UKICAgICB3aGlsZSAoc291cF9tZXNzYWdlX2hlYWRlcnNfaXRl cl9uZXh0KCZpdGVyLCAmbmFtZSwgJnZhbHVlKSkKICAgICAgICAgcmVzcG9uc2UtPnNldEhUVFBI ZWFkZXJGaWVsZChuYW1lLCB2YWx1ZSk7CiAKLSAgICBTdHJpbmcgY29udGVudFR5cGUgPSBzb3Vw X21lc3NhZ2VfaGVhZGVyc19nZXQobXNnLT5yZXNwb25zZV9oZWFkZXJzLCAiQ29udGVudC1UeXBl Iik7CisgICAgR0hhc2hUYWJsZSAqY29udGVudFR5cGVQYXJhbWV0ZXJzID0gMDsKKyAgICBTdHJp bmcgY29udGVudFR5cGUgPSBzb3VwX21lc3NhZ2VfaGVhZGVyc19nZXRfY29udGVudF90eXBlKG1z Zy0+cmVzcG9uc2VfaGVhZGVycywgJmNvbnRlbnRUeXBlUGFyYW1ldGVycyk7CisKKyAgICAvLyBX aGVuIHRoZSBzZXJ2ZXIgc2VuZHMgbXVsdGlwbGUgQ29udGVudC1UeXBlIGhlYWRlcnMsIHNvdXAg d2lsbAorICAgIC8vIGdpdmUgdXMgdGhlaXIgdmFsdWVzIGNvbmNhdGVuYXRlZCB3aXRoIGNvbW1h cyBhcyBhIHNlcGFyYXRvcjsKKyAgICAvLyB3ZSBuZWVkIHRvIGhhbmRsZSB0aGlzIGFuZCB1c2Ug b25seSBvbmUgdmFsdWUuIFdlIHVzZSB0aGUgZmlyc3QKKyAgICAvLyB2YWx1ZSwgYW5kIGFkZCBh bGwgdGhlIHBhcmFtZXRlcnMsIGFmdGVyd2FyZHMsIGlmIGFueS4KKyAgICBpZiAoIWNvbnRlbnRU eXBlLmlzRW1wdHkoKSAmJiBjb250ZW50VHlwZS5maW5kKCIsIiwgMCkpIHsKKyAgICAgICAgVmVj dG9yPFN0cmluZz4gY29udGVudFR5cGVzOworICAgICAgICBjb250ZW50VHlwZS5zcGxpdCgnLCcs IGNvbnRlbnRUeXBlcyk7CisgICAgICAgIGNvbnRlbnRUeXBlID0gY29udGVudFR5cGVzWzBdOwor ICAgIH0KKworICAgIGlmIChjb250ZW50VHlwZVBhcmFtZXRlcnMpIHsKKyAgICAgICAgR0hhc2hU YWJsZUl0ZXIgaGFzaFRhYmxlSXRlcjsKKyAgICAgICAgZ3BvaW50ZXIgaGFzaEtleTsKKyAgICAg ICAgZ3BvaW50ZXIgaGFzaFZhbHVlOworCisgICAgICAgIGdfaGFzaF90YWJsZV9pdGVyX2luaXQo Jmhhc2hUYWJsZUl0ZXIsIGNvbnRlbnRUeXBlUGFyYW1ldGVycyk7CisgICAgICAgIHdoaWxlIChn X2hhc2hfdGFibGVfaXRlcl9uZXh0KCZoYXNoVGFibGVJdGVyLCAmaGFzaEtleSwgJmhhc2hWYWx1 ZSkpIHsKKyAgICAgICAgICAgIGNvbnRlbnRUeXBlICs9ICI7ICI7CisgICAgICAgICAgICBjb250 ZW50VHlwZSArPSBzdGF0aWNfY2FzdDxjaGFyKj4oaGFzaEtleSk7CisgICAgICAgICAgICBjb250 ZW50VHlwZSArPSAiPSI7CisgICAgICAgICAgICBjb250ZW50VHlwZSArPSBzdGF0aWNfY2FzdDxj aGFyKj4oaGFzaFZhbHVlKTsKKyAgICAgICAgfQorICAgICAgICBnX2hhc2hfdGFibGVfZGVzdHJv eShjb250ZW50VHlwZVBhcmFtZXRlcnMpOworICAgIH0KKworICAgIHJlc3BvbnNlLT5zZXRNaW1l VHlwZShleHRyYWN0TUlNRVR5cGVGcm9tTWVkaWFUeXBlKGNvbnRlbnRUeXBlKSk7CisKICAgICBj aGFyKiB1cmkgPSBzb3VwX3VyaV90b19zdHJpbmcoc291cF9tZXNzYWdlX2dldF91cmkobXNnKSwg ZmFsc2UpOwogICAgIHJlc3BvbnNlLT5zZXRVUkwoS1VSTChLVVJMKCksIHVyaSkpOwogICAgIGdf ZnJlZSh1cmkpOwotICAgIHJlc3BvbnNlLT5zZXRNaW1lVHlwZShleHRyYWN0TUlNRVR5cGVGcm9t TWVkaWFUeXBlKGNvbnRlbnRUeXBlKSk7CiAgICAgcmVzcG9uc2UtPnNldFRleHRFbmNvZGluZ05h bWUoZXh0cmFjdENoYXJzZXRGcm9tTWVkaWFUeXBlKGNvbnRlbnRUeXBlKSk7CiAgICAgcmVzcG9u c2UtPnNldEV4cGVjdGVkQ29udGVudExlbmd0aChzb3VwX21lc3NhZ2VfaGVhZGVyc19nZXRfY29u dGVudF9sZW5ndGgobXNnLT5yZXNwb25zZV9oZWFkZXJzKSk7CiAgICAgcmVzcG9uc2UtPnNldEhU VFBTdGF0dXNDb2RlKG1zZy0+c3RhdHVzX2NvZGUpOwotLSAKMS42LjIuMQoK 28944 2009-03-25 13:46:23 -0700 2009-03-30 06:08:02 -0700 use soup facilities to append parameters to the content type use-soup-facilities-to-append-parameters-to-the-content-type.patch text/plain 1970 gustavo MGQ0MmQ3MzU1NmExMzAwOGMxN2U1MGY5YzkyMjNkODVjYmE3NjYyMgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhMjdiYmYwLi4zMTQyMDlj IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMiw2ICsyLDE2IEBACiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAK KyAgICAgICAgVXNlIHNvdXAgZmFjaWxpdGllcyB0byBhcHBlbmQgcGFyYW1ldGVycyB0byB0aGUg Y29udGVudCB0eXBlLCB0bworCW1ha2UgdGhhdCBtb3JlIHJvYnVzdDsKKworICAgICAgICAqIHBs YXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6ZmlsbFJlc3BvbnNlRnJvbU1lc3NhZ2UpOgorCisyMDA5LTAzLTI1ICBHdXN0YXZvIE5v cm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAJaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTI0ODA0CiAJW0dUS10gNDAxIHJlc3BvbnNlcyBjYXVzZSByb2d1ZSBj b250ZW50IHRvIGJlIGxvYWRlZAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAppbmRleCBmNTAxYTg1Li4zZTMwMDQwIDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAu Y3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291 cC5jcHAKQEAgLTE3MSwxNyArMTcxLDE5IEBAIHN0YXRpYyB2b2lkIGZpbGxSZXNwb25zZUZyb21N ZXNzYWdlKFNvdXBNZXNzYWdlKiBtc2csIFJlc291cmNlUmVzcG9uc2UqIHJlc3BvbnNlCiAgICAg Y29udGVudFR5cGUgPSBjb250ZW50VHlwZXNbMF07CiAKICAgICBpZiAoY29udGVudFR5cGVQYXJh bWV0ZXJzKSB7CisgICAgICAgIEdTdHJpbmcqIHBhcmFtZXRlcnNTdHJpbmcgPSBnX3N0cmluZ19u ZXcoMCk7CiAgICAgICAgIEdIYXNoVGFibGVJdGVyIGhhc2hUYWJsZUl0ZXI7CiAgICAgICAgIGdw b2ludGVyIGhhc2hLZXk7CiAgICAgICAgIGdwb2ludGVyIGhhc2hWYWx1ZTsKIAogICAgICAgICBn X2hhc2hfdGFibGVfaXRlcl9pbml0KCZoYXNoVGFibGVJdGVyLCBjb250ZW50VHlwZVBhcmFtZXRl cnMpOwogICAgICAgICB3aGlsZSAoZ19oYXNoX3RhYmxlX2l0ZXJfbmV4dCgmaGFzaFRhYmxlSXRl ciwgJmhhc2hLZXksICZoYXNoVmFsdWUpKSB7Ci0gICAgICAgICAgICBjb250ZW50VHlwZSArPSBT dHJpbmcoIjsgIik7Ci0gICAgICAgICAgICBjb250ZW50VHlwZSArPSBTdHJpbmcoc3RhdGljX2Nh c3Q8Y2hhcio+KGhhc2hLZXkpKTsKLSAgICAgICAgICAgIGNvbnRlbnRUeXBlICs9IFN0cmluZygi PSIpOwotICAgICAgICAgICAgY29udGVudFR5cGUgKz0gU3RyaW5nKHN0YXRpY19jYXN0PGNoYXIq PihoYXNoVmFsdWUpKTsKKyAgICAgICAgICAgIGdfc3RyaW5nX2FwcGVuZChwYXJhbWV0ZXJzU3Ry aW5nLCAiOyAiKTsKKyAgICAgICAgICAgIHNvdXBfaGVhZGVyX2dfc3RyaW5nX2FwcGVuZF9wYXJh bShwYXJhbWV0ZXJzU3RyaW5nLCBzdGF0aWNfY2FzdDxjaGFyKj4oaGFzaEtleSksIHN0YXRpY19j YXN0PGNoYXIqPihoYXNoVmFsdWUpKTsKICAgICAgICAgfQorICAgICAgICBjb250ZW50VHlwZSAr PSBTdHJpbmcocGFyYW1ldGVyc1N0cmluZy0+c3RyKTsKKworICAgICAgICBnX3N0cmluZ19mcmVl KHBhcmFtZXRlcnNTdHJpbmcsIHRydWUpOwogICAgICAgICBnX2hhc2hfdGFibGVfZGVzdHJveShj b250ZW50VHlwZVBhcmFtZXRlcnMpOwogICAgIH0KIAo=