diff options
| author | Patrick Griffis <pgriffis@igalia.com> | 2020-07-27 18:07:37 +0400 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2020-11-14 19:07:24 +0000 |
| commit | 737eef099ca1e34d18245c54b6ed3ba54faf1f9c (patch) | |
| tree | 9e35180cd68cefa2f515f7b38c28fc2000d7cf37 /libsoup/cache | |
| parent | 0f471888b8ad4ab97283023109bcbde714f2ed48 (diff) | |
| download | libsoup-737eef099ca1e34d18245c54b6ed3ba54faf1f9c.tar.gz | |
Replace SoupURI with GUri
Diffstat (limited to 'libsoup/cache')
| -rw-r--r-- | libsoup/cache/soup-cache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libsoup/cache/soup-cache.c b/libsoup/cache/soup-cache.c index d5c4354b..cd0ab5de 100644 --- a/libsoup/cache/soup-cache.c +++ b/libsoup/cache/soup-cache.c @@ -215,7 +215,7 @@ get_cacheability (SoupCache *cache, SoupMessage *msg) } /* Section 13.9 */ - if ((soup_message_get_uri (msg))->query && + if ((g_uri_get_query (soup_message_get_uri (msg))) && !soup_message_headers_get_one (soup_message_get_response_headers (msg), "Expires") && !has_max_age) return SOUP_CACHE_UNCACHEABLE; @@ -470,7 +470,7 @@ soup_cache_entry_new (SoupCache *cache, SoupMessage *msg, time_t request_time, t entry->being_validated = FALSE; entry->status_code = soup_message_get_status (msg); entry->response_time = response_time; - entry->uri = soup_uri_to_string (soup_message_get_uri (msg), FALSE); + entry->uri = g_uri_to_string_partial (soup_message_get_uri (msg), G_URI_HIDE_PASSWORD); /* Headers */ entry->headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_RESPONSE); @@ -667,7 +667,7 @@ soup_cache_entry_lookup (SoupCache *cache, guint32 key; char *uri = NULL; - uri = soup_uri_to_string (soup_message_get_uri (msg), FALSE); + uri = g_uri_to_string_partial (soup_message_get_uri (msg), G_URI_HIDE_PASSWORD); key = get_cache_key_from_uri ((const char *) uri); entry = g_hash_table_lookup (priv->cache, GUINT_TO_POINTER (key)); @@ -1367,7 +1367,7 @@ SoupMessage * soup_cache_generate_conditional_request (SoupCache *cache, SoupMessage *original) { SoupMessage *msg; - SoupURI *uri; + GUri *uri; SoupCacheEntry *entry; const char *last_modified, *etag; GList *disabled_features, *f; |