Title: [273946] trunk/Source/WebKit
Revision
273946
Author
achristen...@apple.com
Date
2021-03-04 20:41:06 -0800 (Thu, 04 Mar 2021)

Log Message

Remove the HTTPSUpgradeEnabled experimental feature
https://bugs.webkit.org/show_bug.cgi?id=222706

Reviewed by Simon Fraser.

* DerivedSources.make:
* Scripts/generate-https-upgrade-database.sh: Removed.
* Shared/HTTPSUpgrade/HTTPSUpgradeList.txt: Removed.

Modified Paths

Removed Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (273945 => 273946)


--- trunk/Source/WebKit/ChangeLog	2021-03-05 04:36:45 UTC (rev 273945)
+++ trunk/Source/WebKit/ChangeLog	2021-03-05 04:41:06 UTC (rev 273946)
@@ -1,3 +1,14 @@
+2021-03-04  Alex Christensen  <achristen...@webkit.org>
+
+        Remove the HTTPSUpgradeEnabled experimental feature
+        https://bugs.webkit.org/show_bug.cgi?id=222706
+
+        Reviewed by Simon Fraser.
+
+        * DerivedSources.make:
+        * Scripts/generate-https-upgrade-database.sh: Removed.
+        * Shared/HTTPSUpgrade/HTTPSUpgradeList.txt: Removed.
+
 2021-03-04  Chris Dumez  <cdu...@apple.com>
 
         NetworkProcessProxy::deleteWebsiteDataInUIProcessForRegistrableDomains() can take domains as an rvalue reference

Modified: trunk/Source/WebKit/DerivedSources.make (273945 => 273946)


--- trunk/Source/WebKit/DerivedSources.make	2021-03-05 04:36:45 UTC (rev 273945)
+++ trunk/Source/WebKit/DerivedSources.make	2021-03-05 04:41:06 UTC (rev 273946)
@@ -396,12 +396,3 @@
 
 $(WEB_PREFERENCES_PATTERNS) : $(WTF_BUILD_SCRIPTS_DIR)/GeneratePreferences.rb $(WEB_PREFERENCES_TEMPLATES) $(WEB_PREFERENCES_COMBINED_INPUT_FILE) $(WEB_PREFERENCES_CATEGORY_INPUT_FILES)
 	$(RUBY) $< --frontend WebKit --base $(WEB_PREFERENCES_COMBINED_INPUT_FILE) --debug ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml --experimental ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml	--internal ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml $(addprefix --template , $(WEB_PREFERENCES_TEMPLATES))
-
-
-# FIXME: We should switch to the internal HTTPSUpgradeList.txt once the feature is ready.
-# VPATH += $(WebKit2)/Shared/HTTPSUpgrade/
-VPATH := $(WebKit2)/Shared/HTTPSUpgrade/ $(VPATH)
-
-all : HTTPSUpgradeList.db
-HTTPSUpgradeList.db : HTTPSUpgradeList.txt $(WebKit2)/Scripts/generate-https-upgrade-database.sh
-	sh $(WebKit2)/Scripts/generate-https-upgrade-database.sh $< $@

Deleted: trunk/Source/WebKit/Scripts/generate-https-upgrade-database.sh (273945 => 273946)


--- trunk/Source/WebKit/Scripts/generate-https-upgrade-database.sh	2021-03-05 04:36:45 UTC (rev 273945)
+++ trunk/Source/WebKit/Scripts/generate-https-upgrade-database.sh	2021-03-05 04:41:06 UTC (rev 273946)
@@ -1,52 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2018 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-# This script requires that HTTPSUpgradeList.txt has the following format:
-#   1. It must be a plain text file with domains delimited by new lines ("\n").
-#   2. The file must not contain duplicate domains.
-#   3. All domains must be lowercase.
-#   4. All domains must be IDNA encoded.
-#
-# Usage:
-# $ sh ./generate-https-upgrade-database.sh <path to input list> <path to output database>
-
-set -e
-
-INPUT_FILE_PATH="${1}"
-OUTPUT_FILE_PATH="${2}"
-
-DB_VERSION="1";
-DB_SCHEMA="CREATE TABLE hosts (host TEXT PRIMARY KEY);"
-
-if [[ ! -f "${INPUT_FILE_PATH}" ]]; then
-    echo "Invalid input file" 1>&2;
-    exit 1
-fi
-
-if [[ -f "${OUTPUT_FILE_PATH}" ]]; then
-    rm "${OUTPUT_FILE_PATH}"
-fi
-
-sqlite3 "${OUTPUT_FILE_PATH}" "PRAGMA user_version=${DB_VERSION}" "${DB_SCHEMA}" ".import ${INPUT_FILE_PATH} hosts" ".exit"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to