[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[philn at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit cf9ae05c22157f57ce736485cef63e28c584419c
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 19 14:37:03 2010 +0000

    2010-10-19  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] Soup cache code still has some warnings
            https://bugs.webkit.org/show_bug.cgi?id=47733
    
            Fixed some compilation warnings happening with gcc 4.4.5 on
            64-bits architecture.
    
            * platform/network/soup/cache/webkit/soup-cache.c:
            (webkit_soup_cache_entry_set_freshness):
            (close_ready_cb):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70056 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dfe407d..9fb1e54 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-19  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Soup cache code still has some warnings
+        https://bugs.webkit.org/show_bug.cgi?id=47733
+
+        Fixed some compilation warnings happening with gcc 4.4.5 on
+        64-bits architecture.
+
+        * platform/network/soup/cache/webkit/soup-cache.c:
+        (webkit_soup_cache_entry_set_freshness):
+        (close_ready_cb):
+
 2010-10-19  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/platform/network/soup/cache/webkit/soup-cache.c b/WebCore/platform/network/soup/cache/webkit/soup-cache.c
index 4a123ba..73b15ba 100644
--- a/WebCore/platform/network/soup/cache/webkit/soup-cache.c
+++ b/WebCore/platform/network/soup/cache/webkit/soup-cache.c
@@ -297,7 +297,7 @@ webkit_soup_cache_entry_set_freshness (WebKitSoupCacheEntry *entry, SoupMessage
 		hash = soup_header_parse_param_list (cache_control);
 
 		/* Should we re-validate the entry when it goes stale */
-		entry->must_revalidate = (gboolean)g_hash_table_lookup (hash, "must-revalidate");
+		entry->must_revalidate = g_hash_table_lookup_extended (hash, "must-revalidate", NULL, NULL);
 
 		/* Section 2.3.1 */
 		if (priv->cache_type == WEBKIT_SOUP_CACHE_SHARED) {
@@ -509,7 +509,7 @@ close_ready_cb (GObject *source, GAsyncResult *result, WebKitSoupCacheWritingFix
 		webkit_soup_cache_entry_free (entry, TRUE);
 		entry = NULL;
 	} else if ((soup_message_headers_get_encoding (entry->headers) == SOUP_ENCODING_CHUNKED) ||
-		   entry->length != content_length) {
+		   entry->length != (gsize) content_length) {
 		/** Two options here:
 		 *
 		 * 1. "chunked" data, entry was temporarily added to

-- 
WebKit Debian packaging