Changeset 239348 in webkit


Ignore:
Timestamp:
Dec 18, 2018 12:59:53 PM (5 years ago)
Author:
commit-queue@webkit.org
Message:

HTTPS Upgrade: Scripts / preprocessing necessary to create new database in future
​https://bugs.webkit.org/show_bug.cgi?id=192612
<rdar://problem/46651207>

Patch by Vivek Seth <​v_seth@apple.com> on 2018-12-18
Reviewed by Andy Estes.

  • Configurations/WebKit.xcconfig:
  • DerivedSources.make:
  • Scripts/generate-https-upgrade-database.sh: Added.
  • WebKit.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r239346 r239348  
     12018-12-18  Vivek Seth  <v_seth@apple.com>
     2
     3        HTTPS Upgrade: Scripts / preprocessing necessary to create new database in future
     4        https://bugs.webkit.org/show_bug.cgi?id=192612
     5        <rdar://problem/46651207>
     6
     7        Reviewed by Andy Estes.
     8
     9        * Configurations/WebKit.xcconfig:
     10        * DerivedSources.make:
     11        * Scripts/generate-https-upgrade-database.sh: Added.
     12        * WebKit.xcodeproj/project.pbxproj:
     13
    1142018-12-18  Wenson Hsieh  <wenson_hsieh@apple.com>
    215

  • trunk/Source/WebKit/Configurations/WebKit.xcconfig

    r239134 r239348  
    152152SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order;
    153153
    154 EXCLUDED_SOURCE_FILE_NAMES = Resources/ios/*;
    155 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb;
     154WK_EXCLUDED_HTTPS_UPGRADE_FILE = $(WK_EXCLUDED_HTTPS_UPGRADE_FILE_$(ENABLE_HTTPS_UPGRADE));
     155WK_EXCLUDED_HTTPS_UPGRADE_FILE_ = HTTPSUpgradeList.db;
     156
     157EXCLUDED_SOURCE_FILE_NAMES = Resources/ios/* $(WK_EXCLUDED_HTTPS_UPGRADE_FILE);
     158EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PluginProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb com.apple.WebKit.plugin-common.sb PlugInSandboxProfiles/*.sb $(WK_EXCLUDED_HTTPS_UPGRADE_FILE);
    156159
    157160INSTALLHDRS_SCRIPT_PHASE = YES;

  • trunk/Source/WebKit/DerivedSources.make

    r238739 r239348  
    316316$(WEB_PREFERENCES_PATTERNS) : $(WebKit2)/Scripts/GeneratePreferences.rb $(WEB_PREFERENCES_TEMPLATES) $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
    317317        $(RUBY) $< --input $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
     318
     319ifeq ($(ENABLE_HTTPS_UPGRADE),ENABLE_HTTPS_UPGRADE)
     320all : HTTPSUpgradeList.db
     321HTTPSUpgradeList.db : HTTPSUpgradeList.txt $(WebKit2)/Scripts/generate-https-upgrade-database.sh
     322        sh $(WebKit2)/Scripts/generate-https-upgrade-database.sh $< $@
     323endif # ENABLE_HTTPS_UPGRADE

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r239262 r239348  
    10381038                57DCEDC7214F18300016B847 /* MockLocalConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 57DCEDC5214F18300016B847 /* MockLocalConnection.h */; };
    10391039                57DCEDCB214F4E420016B847 /* MockAuthenticatorManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 57DCEDC9214F4E420016B847 /* MockAuthenticatorManager.h */; };
     1040                587743A621C30BBE00AE9084 /* HTTPSUpgradeList.db in Resources */ = {isa = PBXBuildFile; fileRef = 587743A421C30AD800AE9084 /* HTTPSUpgradeList.db */; };
    10401041                5C0B17781E7C880E00E9123C /* NetworkSocketStreamMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0B17741E7C879C00E9123C /* NetworkSocketStreamMessageReceiver.cpp */; };
    10411042                5C0B17791E7C882100E9123C /* WebSocketStreamMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0B17761E7C879C00E9123C /* WebSocketStreamMessageReceiver.cpp */; };
    … …  
    34023403                57DCEDC9214F4E420016B847 /* MockAuthenticatorManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockAuthenticatorManager.h; sourceTree = "<group>"; };
    34033404                57DCEDCD214F51680016B847 /* MockAuthenticatorManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MockAuthenticatorManager.cpp; sourceTree = "<group>"; };
     3405                587743A421C30AD800AE9084 /* HTTPSUpgradeList.db */ = {isa = PBXFileReference; lastKnownFileType = file; name = HTTPSUpgradeList.db; path = DerivedSources/WebKit2/HTTPSUpgradeList.db; sourceTree = BUILT_PRODUCTS_DIR; };
    34043406                5C0B17741E7C879C00E9123C /* NetworkSocketStreamMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkSocketStreamMessageReceiver.cpp; path = DerivedSources/WebKit2/NetworkSocketStreamMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    34053407                5C0B17751E7C879C00E9123C /* NetworkSocketStreamMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkSocketStreamMessages.h; path = DerivedSources/WebKit2/NetworkSocketStreamMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
    … …  
    83478349                                1AA575FF1496B7C000A4EE06 /* EventDispatcherMessageReceiver.cpp */,
    83488350                                1AA576001496B7C000A4EE06 /* EventDispatcherMessages.h */,
     8351                                587743A421C30AD800AE9084 /* HTTPSUpgradeList.db */,
    83498352                                2984F586164BA095004BC0C6 /* LegacyCustomProtocolManagerMessageReceiver.cpp */,
    83508353                                2984F587164BA095004BC0C6 /* LegacyCustomProtocolManagerMessages.h */,
    … …  
    1015410157                                414DD37920BF43F5006959FB /* com.cisco.webex.plugin.gpc64.sb in Resources */,
    1015510158                                6BE969C11E54D452008B7483 /* corePrediction_model in Resources */,
     10159                                587743A621C30BBE00AE9084 /* HTTPSUpgradeList.db in Resources */,
    1015610160                                8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
    1015710161                                3FB08E431F60B240005E5312 /* iOS.xcassets in Resources */,
Note: See TracChangeset for help on using the changeset viewer.