OLD | NEW |
---|---|
1 /* | 1 /* |
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) | 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) |
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) | 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) |
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) | 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) |
5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. | 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. |
6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ | 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ |
7 | 7 |
8 This library is free software; you can redistribute it and/or | 8 This library is free software; you can redistribute it and/or |
9 modify it under the terms of the GNU Library General Public | 9 modify it under the terms of the GNU Library General Public |
10 License as published by the Free Software Foundation; either | 10 License as published by the Free Software Foundation; either |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
59 #include "core/loader/PingLoader.h" | 59 #include "core/loader/PingLoader.h" |
60 #include "core/loader/SubstituteData.h" | 60 #include "core/loader/SubstituteData.h" |
61 #include "core/loader/UniqueIdentifier.h" | 61 #include "core/loader/UniqueIdentifier.h" |
62 #include "core/loader/appcache/ApplicationCacheHost.h" | 62 #include "core/loader/appcache/ApplicationCacheHost.h" |
63 #include "core/timing/Performance.h" | 63 #include "core/timing/Performance.h" |
64 #include "core/timing/ResourceTimingInfo.h" | 64 #include "core/timing/ResourceTimingInfo.h" |
65 #include "core/svg/graphics/SVGImageChromeClient.h" | 65 #include "core/svg/graphics/SVGImageChromeClient.h" |
66 #include "platform/Logging.h" | 66 #include "platform/Logging.h" |
67 #include "platform/RuntimeEnabledFeatures.h" | 67 #include "platform/RuntimeEnabledFeatures.h" |
68 #include "platform/TraceEvent.h" | 68 #include "platform/TraceEvent.h" |
69 #include "platform/weborigin/KnownPorts.h" | |
69 #include "platform/weborigin/SchemeRegistry.h" | 70 #include "platform/weborigin/SchemeRegistry.h" |
70 #include "platform/weborigin/SecurityOrigin.h" | 71 #include "platform/weborigin/SecurityOrigin.h" |
71 #include "platform/weborigin/SecurityPolicy.h" | 72 #include "platform/weborigin/SecurityPolicy.h" |
72 #include "public/platform/Platform.h" | 73 #include "public/platform/Platform.h" |
73 #include "public/platform/WebURL.h" | 74 #include "public/platform/WebURL.h" |
74 #include "public/platform/WebURLRequest.h" | 75 #include "public/platform/WebURLRequest.h" |
75 #include "wtf/text/CString.h" | 76 #include "wtf/text/CString.h" |
76 #include "wtf/text/WTFString.h" | 77 #include "wtf/text/WTFString.h" |
77 | 78 |
78 #define PRELOAD_DEBUG 0 | 79 #define PRELOAD_DEBUG 0 |
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
708 } | 709 } |
709 m_validatedURLs.add(request.resourceRequest().url()); | 710 m_validatedURLs.add(request.resourceRequest().url()); |
710 } | 711 } |
711 | 712 |
712 ResourcePtr<Resource> ResourceFetcher::requestResource(Resource::Type type, Fetc hRequest& request) | 713 ResourcePtr<Resource> ResourceFetcher::requestResource(Resource::Type type, Fetc hRequest& request) |
713 { | 714 { |
714 ASSERT(request.options().synchronousPolicy == RequestAsynchronously || type == Resource::Raw); | 715 ASSERT(request.options().synchronousPolicy == RequestAsynchronously || type == Resource::Raw); |
715 | 716 |
716 TRACE_EVENT0("blink", "ResourceFetcher::requestResource"); | 717 TRACE_EVENT0("blink", "ResourceFetcher::requestResource"); |
717 | 718 |
719 maybeUpgradeInsecureRequestURL(request); | |
720 | |
718 KURL url = request.resourceRequest().url(); | 721 KURL url = request.resourceRequest().url(); |
719 | 722 |
720 WTF_LOG(ResourceLoading, "ResourceFetcher::requestResource '%s', charset '%s ', priority=%d, forPreload=%u, type=%s", url.elidedString().latin1().data(), req uest.charset().latin1().data(), request.priority(), request.forPreload(), Resour ceTypeName(type)); | 723 WTF_LOG(ResourceLoading, "ResourceFetcher::requestResource '%s', charset '%s ', priority=%d, forPreload=%u, type=%s", url.elidedString().latin1().data(), req uest.charset().latin1().data(), request.priority(), request.forPreload(), Resour ceTypeName(type)); |
721 | 724 |
722 // If only the fragment identifiers differ, it is the same resource. | 725 // If only the fragment identifiers differ, it is the same resource. |
723 url = MemoryCache::removeFragmentIdentifierIfNeeded(url); | 726 url = MemoryCache::removeFragmentIdentifierIfNeeded(url); |
724 | 727 |
725 if (!url.isValid()) | 728 if (!url.isValid()) |
726 return nullptr; | 729 return nullptr; |
727 | 730 |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
888 if (request.requestContext() == WebURLRequest::RequestContextUnspecified) | 891 if (request.requestContext() == WebURLRequest::RequestContextUnspecified) |
889 determineRequestContext(request, type); | 892 determineRequestContext(request, type); |
890 if (type == Resource::LinkPrefetch || type == Resource::LinkSubresource) | 893 if (type == Resource::LinkPrefetch || type == Resource::LinkSubresource) |
891 request.setHTTPHeaderField("Purpose", "prefetch"); | 894 request.setHTTPHeaderField("Purpose", "prefetch"); |
892 if (frame()->document()) | 895 if (frame()->document()) |
893 request.setOriginatesFromReservedIPRange(frame()->document()->isHostedIn ReservedIPRange()); | 896 request.setOriginatesFromReservedIPRange(frame()->document()->isHostedIn ReservedIPRange()); |
894 | 897 |
895 context().addAdditionalRequestHeaders(document(), request, (type == Resource ::MainResource) ? FetchMainResource : FetchSubresource); | 898 context().addAdditionalRequestHeaders(document(), request, (type == Resource ::MainResource) ? FetchMainResource : FetchSubresource); |
896 } | 899 } |
897 | 900 |
901 void ResourceFetcher::maybeUpgradeInsecureRequestURL(FetchRequest& request) | |
902 { | |
903 if (!m_document) | |
904 return; | |
905 | |
906 KURL url = request.resourceRequest().url(); | |
907 if (m_document->insecureContentPolicy() == SecurityContext::InsecureContentU pgrade && url.protocol() == "http") { | |
Ryan Sleevi
2015/02/05 20:03:04
*cough* ws:// -> wss://
Mike West
2015/02/05 20:19:08
That's going to happen in a followup (somewhere ar
| |
908 url.setProtocol("https"); | |
909 // FIXME: HACKY HACKY HACKY HACKY. | |
910 if (url.port() == 8000 || url.port() == 8080) | |
911 url.setPort(8443); | |
Ryan Sleevi
2015/02/05 20:03:03
wat?
No no no
Mike West
2015/02/05 20:19:08
Totally. I did this to make the test work as a PoC
| |
912 else if (url.port() == 80) | |
913 url.setPort(443); | |
Ryan Sleevi
2015/02/05 20:03:03
yes yes yes
| |
914 request.mutableResourceRequest().setURL(url); | |
915 } | |
916 } | |
917 | |
898 ResourcePtr<Resource> ResourceFetcher::createResourceForRevalidation(const Fetch Request& request, Resource* resource) | 918 ResourcePtr<Resource> ResourceFetcher::createResourceForRevalidation(const Fetch Request& request, Resource* resource) |
899 { | 919 { |
900 ASSERT(resource); | 920 ASSERT(resource); |
901 ASSERT(memoryCache()->contains(resource)); | 921 ASSERT(memoryCache()->contains(resource)); |
902 ASSERT(resource->isLoaded()); | 922 ASSERT(resource->isLoaded()); |
903 ASSERT(resource->canUseCacheValidator()); | 923 ASSERT(resource->canUseCacheValidator()); |
904 ASSERT(!resource->resourceToRevalidate()); | 924 ASSERT(!resource->resourceToRevalidate()); |
905 ASSERT(!isControlledByServiceWorker()); | 925 ASSERT(!isControlledByServiceWorker()); |
906 | 926 |
907 ResourceRequest revalidatingRequest(resource->resourceRequest()); | 927 ResourceRequest revalidatingRequest(resource->resourceRequest()); |
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1579 | 1599 |
1580 void ResourceFetcher::trace(Visitor* visitor) | 1600 void ResourceFetcher::trace(Visitor* visitor) |
1581 { | 1601 { |
1582 visitor->trace(m_document); | 1602 visitor->trace(m_document); |
1583 visitor->trace(m_loaders); | 1603 visitor->trace(m_loaders); |
1584 visitor->trace(m_nonBlockingLoaders); | 1604 visitor->trace(m_nonBlockingLoaders); |
1585 ResourceLoaderHost::trace(visitor); | 1605 ResourceLoaderHost::trace(visitor); |
1586 } | 1606 } |
1587 | 1607 |
1588 } | 1608 } |
OLD | NEW |