diff options
Diffstat (limited to 'content/llcache.c')
| -rw-r--r-- | content/llcache.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/content/llcache.c b/content/llcache.c index 81e08383c..32c7449d2 100644 --- a/content/llcache.c +++ b/content/llcache.c @@ -116,7 +116,7 @@ typedef struct { bool tried_with_auth; /**< Whether we've tried with auth */ - bool tried_with_tls_downgrade; /**< Whether we've tried TLS <= 1.0 */ + bool tried_with_tls_downgrade; /**< Whether we've tried TLS 1.2 */ bool tainted_tls; /**< Whether the TLS transport is tainted */ } llcache_fetch_ctx; @@ -1923,7 +1923,7 @@ llcache_object_retrieve_from_cache(nsurl *url, llcache_object *obj, *newest = NULL; NSLOG(llcache, DEBUG, - "Searching cache for %s flags:%x referer:%s post:%p", + "Searching cache for %s flags:%"PRIx32" referer:%s post:%p", nsurl_access(url), flags, referer==NULL?"":nsurl_access(referer), post); @@ -2100,7 +2100,7 @@ llcache_object_retrieve(nsurl *url, nsurl *defragmented_url; bool uncachable = false; - NSLOG(llcache, DEBUG, "Retrieve %s (%x, %s, %p)", nsurl_access(url), flags, + NSLOG(llcache, DEBUG, "Retrieve %s (%"PRIx32", %s, %p)", nsurl_access(url), flags, referer==NULL?"":nsurl_access(referer), post); @@ -2207,10 +2207,17 @@ static nserror llcache_hsts_transform_url(nsurl *url, nsurl **result, scheme = nsurl_get_component(url, NSURL_SCHEME); if (lwc_string_caseless_isequal(scheme, corestring_lwc_http, &match) != lwc_error_ok || match == false) { - /* Non-HTTP fetch: ignore */ + /* Non-HTTP fetch: no transform required */ + if (lwc_string_caseless_isequal(scheme, corestring_lwc_https, + &match) == lwc_error_ok && match) { + /* HTTPS: ask urldb if HSTS is enabled */ + *hsts_in_use = urldb_get_hsts_enabled(url); + } else { + /* Anything else: no HSTS */ + *hsts_in_use = false; + } lwc_string_unref(scheme); *result = nsurl_ref(url); - *hsts_in_use = false; return error; } lwc_string_unref(scheme); @@ -2966,7 +2973,7 @@ static void llcache_persist(void *p) total_bandwidth = (total_written * 1000) / total_elapsed; NSLOG(llcache, DEBUG, - "Wrote %"PRIssizet" bytes in %lums bw:%lu %s", + "Wrote %"PRIsizet" bytes in %lums bw:%lu %s", written, elapsed, (written * 1000) / elapsed, nsurl_access(lst[idx]->url) ); @@ -3034,7 +3041,7 @@ static void llcache_persist(void *p) llcache->total_elapsed += total_elapsed; NSLOG(llcache, DEBUG, - "writeout size:%"PRIssizet" time:%lu bandwidth:%lubytes/s", + "writeout size:%"PRIsizet" time:%lu bandwidth:%lubytes/s", total_written, total_elapsed, total_bandwidth); NSLOG(llcache, DEBUG, "Rescheduling writeout in %dms", next); @@ -3813,7 +3820,7 @@ void llcache_clean(bool purge) llcache_size -= object->source_len; NSLOG(llcache, DEBUG, - "Freeing source data for %p len:%"PRIssizet, + "Freeing source data for %p len:%"PRIsizet, object, object->source_len); } } @@ -3832,7 +3839,7 @@ void llcache_clean(bool purge) (object->store_state == LLCACHE_STATE_DISC) && (object->source_data == NULL)) { NSLOG(llcache, DEBUG, - "discarding backed object len:%"PRIssizet" age:%ld (%p) %s", + "discarding backed object len:%"PRIsizet" age:%ld (%p) %s", object->source_len, (long)(time(NULL) - object->last_used), object, @@ -3862,7 +3869,7 @@ void llcache_clean(bool purge) (object->fetch.fetch == NULL) && (object->store_state == LLCACHE_STATE_RAM)) { NSLOG(llcache, DEBUG, - "discarding fresh object len:%"PRIssizet" age:%ld (%p) %s", + "discarding fresh object len:%"PRIsizet" age:%ld (%p) %s", object->source_len, (long)(time(NULL) - object->last_used), object, @@ -3876,7 +3883,7 @@ void llcache_clean(bool purge) } } - NSLOG(llcache, DEBUG, "Size: %u (limit: %u)", llcache_size, limit); + NSLOG(llcache, DEBUG, "Size: %"PRIu32" (limit: %"PRIu32")", llcache_size, limit); } /* Exported interface documented in content/llcache.h */ @@ -3897,7 +3904,7 @@ llcache_initialise(const struct llcache_parameters *prm) llcache->all_caught_up = true; NSLOG(llcache, INFO, - "llcache initialising with a limit of %d bytes", + "llcache initialising with a limit of %"PRIu32" bytes", llcache->limit); /* backing store initialisation */ |