--- a/.hgtags Mon Nov 13 12:10:49 2017 -0800
+++ b/.hgtags Mon Nov 13 13:18:35 2017 -0800
@@ -455,3 +455,4 @@
92f08900cb3c0d694e5c529a676c1c9e5909193f jdk-10+28
a6e591e12f122768f675428e1e5a838fd0e9c7ec jdk-10+29
8fee80b92e65149f7414250fd5e34b6f35d417b4 jdk-10+30
+e6278add9ff28fab70fe1cc4c1d65f7363dc9445 jdk-10+31
--- a/make/CreateJmods.gmk Mon Nov 13 12:10:49 2017 -0800
+++ b/make/CreateJmods.gmk Mon Nov 13 13:18:35 2017 -0800
@@ -80,8 +80,8 @@
endif
LEGAL_NOTICES := \
- $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \
- $(call FindModuleLegalDirs, $(MODULE)) \
+ $(call uniq, $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \
+ $(call FindModuleLegalDirs, $(MODULE))) \
#
LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))
--- a/make/common/Modules.gmk Mon Nov 13 12:10:49 2017 -0800
+++ b/make/common/Modules.gmk Mon Nov 13 13:18:35 2017 -0800
@@ -409,8 +409,10 @@
# $1 - Module to find legal dirs for
FindModuleLegalDirs = \
$(strip $(wildcard \
- $(addsuffix /$(strip $1), $(IMPORT_MODULES_LEGAL)) \
- $(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
+ $(addsuffix /$(strip $1), $(SUPPORT_OUTPUTDIR)/modules_legal \
+ $(IMPORT_MODULES_LEGAL)) \
+ $(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))) \
+ ))
################################################################################
--- a/make/conf/jib-profiles.js Mon Nov 13 12:10:49 2017 -0800
+++ b/make/conf/jib-profiles.js Mon Nov 13 13:18:35 2017 -0800
@@ -518,32 +518,6 @@
common.slowdebug_profile_base);
});
- // Generate open only profiles for all the main profiles for JPRT and reference
- // implementation builds.
- common.main_profile_names.forEach(function (name) {
- var openName = name + common.open_suffix;
- profiles[openName] = concatObjects(profiles[name],
- common.open_profile_base);
- });
- // The open only profiles on linux are used for reference builds and should
- // produce the compact profile images by default. This adds "profiles" as an
- // extra default target.
- var openOnlyProfilesExtra = {
- "linux-x86-open": {
- default_make_targets: "profiles-bundles",
- configure_args: "--with-jvm-variants=client,server"
- }
- };
- profiles = concatObjects(profiles, openOnlyProfilesExtra);
-
- // Generate debug profiles for the open only profiles
- common.main_profile_names.forEach(function (name) {
- var openName = name + common.open_suffix;
- var openDebugName = openName + common.debug_suffix;
- profiles[openDebugName] = concatObjects(profiles[openName],
- common.debug_profile_base);
- });
-
// Profiles for building the zero jvm variant. These are used for verification
// in JPRT.
var zeroProfiles = {
@@ -579,82 +553,6 @@
profiles[debugName] = concatObjects(profiles[name], common.debug_profile_base);
});
- // Profiles used to run tests. Used in JPRT and Mach 5.
- var testOnlyProfiles = {
- "run-test-jprt": {
- target_os: input.build_os,
- target_cpu: input.build_cpu,
- dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ],
- labels: "test",
- environment: {
- "JT_JAVA": common.boot_jdk_home
- }
- },
-
- "run-test": {
- target_os: input.build_os,
- target_cpu: input.build_cpu,
- dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ],
- labels: "test",
- environment: {
- "JT_JAVA": common.boot_jdk_home
- }
- }
- };
- profiles = concatObjects(profiles, testOnlyProfiles);
-
- // Profiles used to run tests using Jib for internal dependencies.
- var testedProfile = input.testedProfile;
- if (testedProfile == null) {
- testedProfile = input.build_os + "-" + input.build_cpu;
- }
- var testOnlyProfilesPrebuilt = {
- "run-test-prebuilt": {
- target_os: input.build_os,
- target_cpu: input.build_cpu,
- src: "src.conf",
- dependencies: [ "jtreg", "gnumake", "boot_jdk", "jib", testedProfile + ".jdk",
- testedProfile + ".test", "src.full"
- ],
- work_dir: input.get("src.full", "install_path") + "/test",
- environment: {
- "JT_JAVA": common.boot_jdk_home,
- "PRODUCT_HOME": input.get(testedProfile + ".jdk", "home_path"),
- "TEST_IMAGE_DIR": input.get(testedProfile + ".test", "home_path"),
- "TEST_OUTPUT_DIR": input.src_top_dir
- },
- labels: "test"
- }
- };
- // If actually running the run-test-prebuilt profile, verify that the input
- // variable is valid and if so, add the appropriate target_* values from
- // the tested profile.
- if (input.profile == "run-test-prebuilt") {
- if (profiles[testedProfile] == null) {
- error("testedProfile is not defined: " + testedProfile);
- }
- }
- if (profiles[testedProfile] != null) {
- testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"]
- = profiles[testedProfile]["target_os"];
- testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"]
- = profiles[testedProfile]["target_cpu"];
- }
- profiles = concatObjects(profiles, testOnlyProfilesPrebuilt);
-
- // On macosx add the devkit bin dir to the path in all the run-test profiles.
- // This gives us a guaranteed working version of lldb for the jtreg failure handler.
- if (input.build_os == "macosx") {
- macosxRunTestExtra = {
- dependencies: [ "devkit" ],
- environment_path: input.get("devkit", "install_path")
- + "/Xcode.app/Contents/Developer/usr/bin"
- }
- profiles["run-test"] = concatObjects(profiles["run-test"], macosxRunTestExtra);
- profiles["run-test-jprt"] = concatObjects(profiles["run-test-jprt"], macosxRunTestExtra);
- profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"], macosxRunTestExtra);
- }
-
//
// Define artifacts for profiles
//
@@ -707,7 +605,6 @@
common.debug_profile_artifacts(artifactData[name]));
});
- // Extra profile specific artifacts
profilesArtifacts = {
"linux-x64": {
artifacts: {
@@ -719,261 +616,51 @@
],
},
}
- },
-
- "linux-x64-open": {
- artifacts: {
- jdk: {
- local: "bundles/\\(jdk.*bin.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/linux-x64/jdk-" + data.version
- + "_linux-x64_bin.tar.gz",
- "bundles/openjdk/GPL/linux-x64/\\1"
- ],
- subdir: "jdk-" + data.version
- },
- jre: {
- local: "bundles/\\(jre.*bin.tar.gz\\)",
- remote: "bundles/openjdk/GPL/linux-x64/\\1",
- },
- test: {
- local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/linux-x64/jdk-" + data.version
- + "_linux-x64_bin-tests.tar.gz",
- "bundles/openjdk/GPL/linux-x64/\\1"
- ]
- },
- jdk_symbols: {
- local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/linux-x64/jdk-" + data.version
- + "_linux-x64_bin-symbols.tar.gz",
- "bundles/openjdk/GPL/linux-x64/\\1"
- ],
- subdir: "jdk-" + data.version
- },
- jre_symbols: {
- local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
- remote: "bundles/openjdk/GPL/linux-x64/\\1",
- },
- doc_api_spec: {
- local: "bundles/\\(jdk.*doc-api-spec.tar.gz\\)",
- remote: "bundles/openjdk/GPL/linux-x64/\\1",
- },
- }
- },
-
- "linux-x86-open": {
- artifacts: {
- jdk: {
- local: "bundles/\\(jdk.*bin.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/linux-x86/jdk-" + data.version
- + "_linux-x86_bin.tar.gz",
- "bundles/openjdk/GPL/linux-x86/\\1"
- ],
- subdir: "jdk-" + data.version
- },
- jdk_symbols: {
- local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/linux-x86/jdk-" + data.version
- + "_linux-x86_bin-symbols.tar.gz",
- "bundles/openjdk/GPL/linux-x86/\\1"
- ],
- subdir: "jdk-" + data.version
- },
- test: {
- local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/linux-x86/jdk-" + data.version
- + "_linux-x86_bin-tests.tar.gz",
- "bundles/openjdk/GPL/linux-x86/\\1"
- ]
- },
- jre: {
- // This regexp needs to not match the compact* files below
- local: "bundles/\\(jre.*[+][0-9]\\{1,\\}_linux-x86_bin.tar.gz\\)",
- remote: "bundles/openjdk/GPL/profile/linux-x86/\\1",
- },
- jre_compact1: {
- local: "bundles/\\(jre.*-compact1_linux-x86_bin.tar.gz\\)",
- remote: "bundles/openjdk/GPL/profile/linux-x86/\\1",
- },
- jre_compact2: {
- local: "bundles/\\(jre.*-compact2_linux-x86_bin.tar.gz\\)",
- remote: "bundles/openjdk/GPL/profile/linux-x86/\\1",
- },
- jre_compact3: {
- local: "bundles/\\(jre.*-compact3_linux-x86_bin.tar.gz\\)",
- remote: "bundles/openjdk/GPL/profile/linux-x86/\\1",
- },
- }
- },
-
- "macosx-x64-open": {
- artifacts: {
- jdk: {
- local: "bundles/\\(jdk.*bin.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/osx-x64/jdk-" + data.version
- + "_osx-x64_bin.tar.gz",
- "bundles/openjdk/GPL/osx-x64/\\1"
- ],
- subdir: "jdk-" + data.version
- },
- jre: {
- local: "bundles/\\(jre.*bin.tar.gz\\)",
- remote: "bundles/openjdk/GPL/osx-x64/\\1",
- },
- test: {
- local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/osx-x64/jdk-" + data.version
- + "_osx-x64_bin-tests.tar.gz",
- "bundles/openjdk/GPL/osx-x64/\\1"
- ]
- },
- jdk_symbols: {
- local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/osx-x64/jdk-" + data.version
- + "_osx-x64_bin-symbols.tar.gz",
- "bundles/openjdk/GPL/osx-x64/\\1"
- ],
- subdir: "jdk-" + data.version
- },
- jre_symbols: {
- local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
- remote: "bundles/openjdk/GPL/osx-x64/\\1",
- },
- doc_api_spec: {
- local: "bundles/\\(jdk.*doc-api-spec.tar.gz\\)",
- remote: "bundles/openjdk/GPL/osx-x64/\\1",
- },
- }
- },
-
- "windows-x86-open": {
- artifacts: {
- jdk: {
- local: "bundles/\\(jdk.*bin.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/windows-x86/jdk-" + data.version
- + "_windows-x86_bin.tar.gz",
- "bundles/openjdk/GPL/windows-x86/\\1"
- ],
- subdir: "jdk-" + data.version
- },
- jre: {
- local: "bundles/\\(jre.*bin.tar.gz\\)",
- remote: "bundles/openjdk/GPL/windows-x86/\\1"
- },
- test: {
- local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/windows-x86/jdk-" + data.version
- + "_windows-x86_bin-tests.tar.gz",
- "bundles/openjdk/GPL/windows-x86/\\1"
- ]
- },
- jdk_symbols: {
- local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/windows-x86/jdk-" + data.version
- + "_windows-x86_bin-symbols.tar.gz",
- "bundles/openjdk/GPL/windows-x86/\\1"
- ],
- subdir: "jdk-" + data.version
- },
- jre_symbols: {
- local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
- remote: "bundles/openjdk/GPL/windows-x86/\\1",
- }
- }
- },
-
- "windows-x64-open": {
- artifacts: {
- jdk: {
- local: "bundles/\\(jdk.*bin.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/windows-x64/jdk-" + data.version
- + "_windows-x64_bin.tar.gz",
- "bundles/openjdk/GPL/windows-x64/\\1"
- ],
- subdir: "jdk-" + data.version
- },
- jre: {
- local: "bundles/\\(jre.*bin.tar.gz\\)",
- remote: "bundles/openjdk/GPL/windows-x64/\\1"
- },
- test: {
- local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/windows-x64/jdk-" + data.version
- + "_windows-x64_bin-tests.tar.gz",
- "bundles/openjdk/GPL/windows-x64/\\1"
- ]
- },
- jdk_symbols: {
- local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
- remote: [
- "bundles/openjdk/GPL/windows-x64/jdk-" + data.version
- + "_windows-x64_bin-symbols.tar.gz",
- "bundles/openjdk/GPL/windows-x64/\\1"
- ],
- subdir: "jdk-" + data.version
- },
- jre_symbols: {
- local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
- remote: "bundles/openjdk/GPL/windows-x64/\\1",
- }
- }
- },
-
- "linux-x86-open-debug": {
- artifacts: {
- jdk: {
- local: "bundles/\\(jdk.*bin-debug.tar.gz\\)",
- remote: "bundles/openjdk/GPL/profile/linux-x86/\\1",
- },
- jre: {
- local: "bundles/\\(jre.*bin-debug.tar.gz\\)",
- remote: "bundles/openjdk/GPL/profile/linux-x86/\\1",
- },
- jdk_symbols: {
- local: "bundles/\\(jdk.*bin-debug-symbols.tar.gz\\)",
- remote: "bundles/openjdk/GPL/profile/linux-x86/\\1",
- },
- }
- },
-
+ }
};
profiles = concatObjects(profiles, profilesArtifacts);
+ // Generate open only profiles for all the main and debug profiles.
+ // Rewrite artifact remote paths by adding "openjdk/GPL".
+ common.main_profile_names.forEach(function (name) {
+ var openName = name + common.open_suffix;
+ profiles[openName] = concatObjects(profiles[name],
+ common.open_profile_base);
+ for (artifactName in profiles[openName].artifacts) {
+ var artifact = profiles[openName].artifacts[artifactName];
+ artifact.remote = replaceAll(
+ "bundles\/", "bundles/openjdk/GPL/",
+ (artifact.remote != null ? artifact.remote : artifact.local));
+ }
+ var debugName = name + common.debug_suffix;
+ var openDebugName = name + common.open_suffix + common.debug_suffix;
+ profiles[openDebugName] = concatObjects(profiles[debugName],
+ common.open_profile_base);
+ for (artifactName in profiles[openDebugName].artifacts) {
+ var artifact = profiles[openDebugName].artifacts[artifactName];
+ artifact.remote = replaceAll(
+ "bundles\/", "bundles/openjdk/GPL/",
+ (artifact.remote != null ? artifact.remote : artifact.local));
+ }
+ });
// Define the reference implementation profiles. These are basically the same
- // as the open profiles, but upload artifacts to a different location and
- // are only defined for specific platforms.
- profiles["linux-x64-ri"] = clone(profiles["linux-x64-open"]);
- profiles["linux-x86-ri"] = clone(profiles["linux-x86-open"]);
- profiles["linux-x86-ri-debug"] = clone(profiles["linux-x86-open-debug"]);
- profiles["macosx-x64-ri"] = clone(profiles["macosx-x64-open"]);
- profiles["windows-x86-ri"] = clone(profiles["windows-x86-open"]);
- profiles["windows-x64-ri"] = clone(profiles["windows-x64-open"]);
-
- // Generate artifacts for ri profiles
- [ "linux-x64-ri", "linux-x86-ri", "linux-x86-ri-debug", "macosx-x64-ri", "windows-x86-ri", "windows-x64-ri" ]
- .forEach(function (name) {
- // Rewrite all remote dirs to "bundles/openjdk/BCL/..."
- for (artifactName in profiles[name].artifacts) {
- var artifact = profiles[name].artifacts[artifactName];
- artifact.remote = replaceAll("\/GPL\/", "/BCL/",
- (artifact.remote != null ? artifact.remote : artifact.local));
- }
- });
+ // as the open profiles, but upload artifacts to a different location.
+ common.main_profile_names.forEach(function (name) {
+ var riName = name + "-ri";
+ var riDebugName = riName + common.debug_suffix;
+ var openName = name + common.open_suffix;
+ var openDebugName = openName + common.debug_suffix;
+ profiles[riName] = clone(profiles[openName]);
+ profiles[riDebugName] = clone(profiles[openDebugName]);
+ // Rewrite all remote dirs to "bundles/openjdk/BCL/..."
+ for (artifactName in profiles[riName].artifacts) {
+ var artifact = profiles[riName].artifacts[artifactName];
+ artifact.remote = replaceAll(
+ "\/GPL\/", "/BCL/",
+ (artifact.remote != null ? artifact.remote : artifact.local));
+ }
+ });
// The windows ri profile needs to add the freetype license file
profilesRiFreetype = {
@@ -990,6 +677,83 @@
};
profiles = concatObjects(profiles, profilesRiFreetype);
+ // Profiles used to run tests. Used in JPRT and Mach 5.
+ var testOnlyProfiles = {
+ "run-test-jprt": {
+ target_os: input.build_os,
+ target_cpu: input.build_cpu,
+ dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ],
+ labels: "test",
+ environment: {
+ "JT_JAVA": common.boot_jdk_home
+ }
+ },
+
+ "run-test": {
+ target_os: input.build_os,
+ target_cpu: input.build_cpu,
+ dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ],
+ labels: "test",
+ environment: {
+ "JT_JAVA": common.boot_jdk_home
+ }
+ }
+ };
+ profiles = concatObjects(profiles, testOnlyProfiles);
+
+ // Profiles used to run tests using Jib for internal dependencies.
+ var testedProfile = input.testedProfile;
+ if (testedProfile == null) {
+ testedProfile = input.build_os + "-" + input.build_cpu;
+ }
+ var testOnlyProfilesPrebuilt = {
+ "run-test-prebuilt": {
+ target_os: input.build_os,
+ target_cpu: input.build_cpu,
+ src: "src.conf",
+ dependencies: [ "jtreg", "gnumake", "boot_jdk", "jib", testedProfile + ".jdk",
+ testedProfile + ".test", "src.full"
+ ],
+ work_dir: input.get("src.full", "install_path") + "/test",
+ environment: {
+ "JT_JAVA": common.boot_jdk_home,
+ "PRODUCT_HOME": input.get(testedProfile + ".jdk", "home_path"),
+ "TEST_IMAGE_DIR": input.get(testedProfile + ".test", "home_path"),
+ "TEST_OUTPUT_DIR": input.src_top_dir
+ },
+ labels: "test"
+ }
+ };
+
+ // If actually running the run-test-prebuilt profile, verify that the input
+ // variable is valid and if so, add the appropriate target_* values from
+ // the tested profile.
+ if (input.profile == "run-test-prebuilt") {
+ if (profiles[testedProfile] == null) {
+ error("testedProfile is not defined: " + testedProfile);
+ }
+ }
+ if (profiles[testedProfile] != null) {
+ testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"]
+ = profiles[testedProfile]["target_os"];
+ testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"]
+ = profiles[testedProfile]["target_cpu"];
+ }
+ profiles = concatObjects(profiles, testOnlyProfilesPrebuilt);
+
+ // On macosx add the devkit bin dir to the path in all the run-test profiles.
+ // This gives us a guaranteed working version of lldb for the jtreg failure handler.
+ if (input.build_os == "macosx") {
+ macosxRunTestExtra = {
+ dependencies: [ "devkit" ],
+ environment_path: input.get("devkit", "install_path")
+ + "/Xcode.app/Contents/Developer/usr/bin"
+ }
+ profiles["run-test"] = concatObjects(profiles["run-test"], macosxRunTestExtra);
+ profiles["run-test-jprt"] = concatObjects(profiles["run-test-jprt"], macosxRunTestExtra);
+ profiles["run-test-prebuilt"] = concatObjects(profiles["run-test-prebuilt"], macosxRunTestExtra);
+ }
+
// Generate the missing platform attributes
profiles = generatePlatformAttributes(profiles);
profiles = generateDefaultMakeTargetsConfigureArg(common, profiles);
@@ -1060,7 +824,7 @@
jtreg: {
server: "javare",
revision: "4.2",
- build_number: "b09",
+ build_number: "b10",
checksum_file: "MD5_VALUES",
file: "jtreg_bin-4.2.zip",
environment_name: "JT_HOME",
--- a/make/data/tzdata/VERSION Mon Nov 13 12:10:49 2017 -0800
+++ b/make/data/tzdata/VERSION Mon Nov 13 13:18:35 2017 -0800
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2017b
+tzdata2017c
--- a/make/data/tzdata/africa Mon Nov 13 12:10:49 2017 -0800
+++ b/make/data/tzdata/africa Mon Nov 13 13:18:35 2017 -0800
@@ -49,7 +49,7 @@
#
# For data circa 1899, a common source is:
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
+# https://www.jstor.org/stable/1774359
#
# A reliable and entertaining source about time zones is
# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
@@ -241,7 +241,7 @@
# saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
# http://www.nentjes.info/Bill/bill5.htm
-# http://www.timeanddate.com/worldclock/city.html?n=53
+# https://www.timeanddate.com/worldclock/city.html?n=53
# From Steffen Thorsen (2007-09-04): The official information...:
# http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
Rule Egypt 2007 only - Sep Thu>=1 24:00 0 -
@@ -279,8 +279,8 @@
# timeanddate[2] and another site I've found[3] also support that.
#
# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
+# [2] https://www.timeanddate.com/worldclock/clockchange.html?n=53
+# [3] https://wwp.greenwichmeantime.com/time-zone/africa/egypt/
# From Arthur David Olson (2009-04-20):
# In 2009 (and for the next several years), Ramadan ends before the fourth
@@ -290,10 +290,10 @@
# From Steffen Thorsen (2009-08-11):
# We have been able to confirm the August change with the Egyptian Cabinet
# Information and Decision Support Center:
-# http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
+# https://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
#
# The Middle East News Agency
-# http://www.mena.org.eg/index.aspx
+# https://www.mena.org.eg/index.aspx
# also reports "Egypt starts winter time on August 21"
# today in article numbered "71, 11/08/2009 12:25 GMT."
# Only the title above is available without a subscription to their service,
@@ -343,7 +343,7 @@
# Thursday of April.... Clocks will still be turned back for Ramadan, but
# dates not yet announced....
# http://almogaz.com/news/weird-news/2015/04/05/1947105 ...
-# http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html
+# https://www.timeanddate.com/news/time/egypt-starts-dst-2015.html
# From Ahmed Nazmy (2015-04-20):
# Egypt's ministers cabinet just announced ... that it will cancel DST at
@@ -470,11 +470,11 @@
# From Even Scharning (2012-11-10):
# Libya set their time one hour back at 02:00 on Saturday November 10.
-# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/
+# https://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/
# Here is an official source [in Arabic]: http://ls.ly/fb6Yc
#
# Steffen Thorsen forwarded a translation (2012-11-10) in
-# http://mm.icann.org/pipermail/tz/2012-November/018451.html
+# https://mm.icann.org/pipermail/tz/2012-November/018451.html
#
# From Tim Parenti (2012-11-11):
# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1.
@@ -485,7 +485,7 @@
# From Even Scharning (2013-10-25):
# The scheduled end of DST in Libya on Friday, October 25, 2013 was
# cancelled yesterday....
-# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
+# https://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
#
# From Paul Eggert (2013-10-25):
# For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
@@ -538,7 +538,7 @@
# basis....
# It seems that Mauritius observed daylight saving time from 1982-10-10 to
# 1983-03-20 as well, but that was not successful....
-# http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html
+# https://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html
# From Alex Krivenyshev (2008-06-25):
# http://economicdevelopment.gov.mu/portal/site/Mainhomepage/menuitem.a42b24128104d9845dabddd154508a0c/?content_id=0a7cee8b5d69a110VgnVCM1000000a04a8c0RCRD
@@ -606,7 +606,7 @@
# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
#
# Our wrap-up:
-# http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
+# https://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
# From Arthur David Olson (2009-07-11):
# The "mauritius-dst-will-not-repeat" wrapup includes this:
@@ -638,7 +638,7 @@
# be one hour ahead of GMT between 1 June and 27 September, according to
# Communication Minister and Government Spokesman, Khalid Naciri...."
#
-# http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
+# http://www.worldtimezone.com/dst_news/dst_news_morocco01.html
# http://en.afrik.com/news11892.html
# From Alex Krivenyshev (2008-05-09):
@@ -651,7 +651,7 @@
# From Patrice Scattolin (2008-05-09):
# According to this article:
-# http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
+# https://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
# (and republished here: <http://www.actu.ma/heure-dete-comment_i127896_0.html>)
# the changes occur at midnight:
#
@@ -673,7 +673,7 @@
# posted in English).
#
# The following Google query will generate many relevant hits:
-# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
+# https://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
# From Steffen Thorsen (2008-08-27):
# Morocco will change the clocks back on the midnight between August 31
@@ -684,7 +684,7 @@
# http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
#
# We have some further details posted here:
-# http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
+# https://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
# From Steffen Thorsen (2009-03-17):
# Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
@@ -694,7 +694,7 @@
# (French)
#
# Our summary:
-# http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
+# https://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
# From Alexander Krivenyshev (2009-03-17):
# Here is a link to official document from Royaume du Maroc Premier Ministre,
@@ -717,7 +717,7 @@
# http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
# (French)
# Our page:
-# http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
+# https://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
# From Dan Abitol (2011-03-30):
# ...Rules for Africa/Casablanca are the following (24h format)
@@ -734,7 +734,7 @@
# They said that the decision was already taken.
#
# More articles in the press
-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
+# https://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
# http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
@@ -826,7 +826,7 @@
# 1433 (18 April 2012) and the decision of the Head of Government of
# 16 N. 3-29-15 Chaaban 1435 (4 June 2015).
# Source (french):
-# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
+# https://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
#
# From Milamber (2015-06-09):
# http://www.mmsp.gov.ma/fr/actualites.aspx?id=863
@@ -835,7 +835,7 @@
# [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go
# from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch....
# I think the patch is correct and the quoted text is wrong; the text in
-# <http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/> agrees
+# <https://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/> agrees
# with the patch.
# From Paul Eggert (2015-06-08):
@@ -960,9 +960,17 @@
Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo
Link Africa/Maputo Africa/Lusaka # Zambia
+
# Namibia
-# The 1994-04-03 transition is from Shanks & Pottenger.
-# Shanks & Pottenger report no DST after 1998-04; go with IATA.
+
+# From Arthur David Olson (2017-08-09):
+# The text of the "Namibia Time Act, 1994" is available online at
+# www.lac.org.na/laws/1994/811.pdf
+# and includes this nugget:
+# Notwithstanding the provisions of subsection (2) of section 1, the
+# first winter period after the commencement of this Act shall
+# commence at OOhOO on Monday 21 March 1994 and shall end at 02h00 on
+# Sunday 4 September 1994.
# From Petronella Sibeene (2007-03-30):
# http://allafrica.com/stories/200703300178.html
@@ -978,19 +986,30 @@
# observes Botswana time, we have no details about historical practice.
# In the meantime people there can use Africa/Gaborone.
# See: Immanuel S. The Namibian. 2017-02-23.
-# http://www.namibian.com.na/51480/read/Time-change-divides-lawmakers
+# https://www.namibian.com.na/51480/read/Time-change-divides-lawmakers
+
+# From Steffen Thorsen (2017-08-09):
+# Namibia is going to change their time zone to what is now their DST:
+# https://www.newera.com.na/2017/02/23/namibias-winter-time-might-be-repealed/
+# This video is from the government decision:
+# https://www.nbc.na/news/na-passes-namibia-time-bill-repealing-1994-namibia-time-act.8665
+# We have made the assumption so far that they will change their time zone at
+# the same time they would normally start DST, the first Sunday in September:
+# https://www.timeanddate.com/news/time/namibia-new-time-zone.html
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Namibia 1994 max - Sep Sun>=1 2:00 1:00 S
-Rule Namibia 1995 max - Apr Sun>=1 2:00 0 -
+Rule Namibia 1994 only - Mar 21 0:00 0 -
+Rule Namibia 1994 2016 - Sep Sun>=1 2:00 1:00 S
+Rule Namibia 1995 2017 - Apr Sun>=1 2:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8
1:30 - +0130 1903 Mar
2:00 - SAST 1942 Sep 20 2:00
2:00 1:00 SAST 1943 Mar 21 2:00
2:00 - SAST 1990 Mar 21 # independence
- 2:00 - CAT 1994 Apr 3
- 1:00 Namibia WA%sT
+ 2:00 - CAT 1994 Mar 21 0:00
+ 1:00 Namibia WA%sT 2017 Sep 3 2:00
+ 2:00 - CAT
# Niger
# See Africa/Lagos.
@@ -1077,14 +1096,24 @@
# no information
# Sudan
-#
+
# From <http://www.sunanews.net/sn13jane.html>
# Sudan News Agency (2000-01-13),
# also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen:
# Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
# Saturday.... This was announced Thursday by Caretaker State Minister for
# Manpower Abdul-Rahman Nur-Eddin.
+
+# From Ahmed Atyya, National Telecommunications Corp. (NTC), Sudan (2017-10-17):
+# ... the Republic of Sudan is going to change the time zone from (GMT+3:00)
+# to (GMT+ 2:00) starting from Wednesday 1 November 2017.
#
+# From Paul Eggert (2017-10-18):
+# A scanned copy (in Arabic) of Cabinet Resolution No. 352 for the
+# year 2017 can be found as an attachment in email today from Yahia
+# Abdalla of NTC, archived at:
+# https://mm.icann.org/pipermail/tz/2017-October/025333.html
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Sudan 1970 only - May 1 0:00 1:00 S
Rule Sudan 1970 1985 - Oct 15 0:00 0 -
@@ -1093,10 +1122,14 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Khartoum 2:10:08 - LMT 1931
2:00 Sudan CA%sT 2000 Jan 15 12:00
- 3:00 - EAT
+ 3:00 - EAT 2017 Nov 1
+ 2:00 - CAT
# South Sudan
-Link Africa/Khartoum Africa/Juba
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Juba 2:06:28 - LMT 1931
+ 2:00 Sudan CA%sT 2000 Jan 15 12:00
+ 3:00 - EAT
# Swaziland
# See Africa/Johannesburg.
@@ -1134,11 +1167,11 @@
# According to several news sources, Tunisia will not observe DST this year.
# (Arabic)
# http://www.elbashayer.com/?page=viewn&nid=42546
-# http://www.babnet.net/kiwidetail-15295.asp
+# https://www.babnet.net/kiwidetail-15295.asp
#
# We have also confirmed this with the US embassy in Tunisia.
# We have a wrap-up about this on the following page:
-# http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
+# https://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
# From Alexander Krivenyshev (2009-03-17):
# Here is a link to Tunis Afrique Presse News Agency
--- a/make/data/tzdata/antarctica Mon Nov 13 12:10:49 2017 -0800
+++ b/make/data/tzdata/antarctica Mon Nov 13 13:18:35 2017 -0800
@@ -49,7 +49,7 @@
# Heard Island, McDonald Islands (uninhabited)
# previously sealers and scientific personnel wintered
# Margaret Turner reports
-# http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
+# https://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
# (1999-09-30) that they're UT +05, with no DST;
# presumably this is when they have visitors.
#
@@ -70,7 +70,7 @@
# http://www.aad.gov.au/default.asp?casid=37079
#
# We have more background information here:
-# http://www.timeanddate.com/news/time/antarctica-new-times.html
+# https://www.timeanddate.com/news/time/antarctica-new-times.html
# From Steffen Thorsen (2010-03-10):
# We got these changes from the Australian Antarctic Division: ...
@@ -85,7 +85,7 @@
# - Mawson station stays on UTC+5.
#
# Background:
-# http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
+# https://www.timeanddate.com/news/time/antartica-time-changes-2010.html
# From Steffen Thorsen (2016-10-28):
# Australian Antarctica Division informed us that Casey changed time
@@ -168,7 +168,7 @@
#
# year-round base in the main continent
# Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
-# <http://en.wikipedia.org/wiki/Dumont_d'Urville_Station> (2005-12-05)
+# <https://en.wikipedia.org/wiki/Dumont_d'Urville_Station> (2005-12-05)
#
# Another base at Port-Martin, 50km east, began operation in 1947.
# It was destroyed by fire on 1952-01-14.
--- a/make/data/tzdata/asia Mon Nov 13 12:10:49 2017 -0800
+++ b/make/data/tzdata/asia Mon Nov 13 13:18:35 2017 -0800
@@ -49,7 +49,7 @@
#
# For data circa 1899, a common source is:
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
+# https://www.jstor.org/stable/1774359
#
# For Russian data circa 1919, a source is:
# Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
@@ -98,8 +98,8 @@
Rule RussiaAsia 1981 1984 - Apr 1 0:00 1:00 S
Rule RussiaAsia 1981 1983 - Oct 1 0:00 0 -
Rule RussiaAsia 1984 1995 - Sep lastSun 2:00s 0 -
-Rule RussiaAsia 1985 2011 - Mar lastSun 2:00s 1:00 S
-Rule RussiaAsia 1996 2011 - Oct lastSun 2:00s 0 -
+Rule RussiaAsia 1985 2010 - Mar lastSun 2:00s 1:00 S
+Rule RussiaAsia 1996 2010 - Oct lastSun 2:00s 0 -
# Afghanistan
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -132,13 +132,17 @@
# or
# (brief)
# http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Armenia 2011 only - Mar lastSun 2:00s 1:00 S
+Rule Armenia 2011 only - Oct lastSun 2:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Yerevan 2:58:00 - LMT 1924 May 2
3:00 - +03 1957 Mar
4:00 RussiaAsia +04/+05 1991 Mar 31 2:00s
3:00 RussiaAsia +03/+04 1995 Sep 24 2:00s
4:00 - +04 1997
- 4:00 RussiaAsia +04/+05
+ 4:00 RussiaAsia +04/+05 2011
+ 4:00 Armenia +04/+05
# Azerbaijan
@@ -150,7 +154,7 @@
# From Steffen Thorsen (2016-03-17):
# ... the Azerbaijani Cabinet of Ministers has cancelled switching to
# daylight saving time....
-# http://www.azernews.az/azerbaijan/94137.html
+# https://www.azernews.az/azerbaijan/94137.html
# http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-daylight-saving-time.html
# http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
@@ -191,11 +195,11 @@
# the 19th and 20th, and they have not set the end date yet.
#
# Some sources:
-# http://in.reuters.com/article/southAsiaNews/idINIndia-40017620090601
+# https://in.reuters.com/article/southAsiaNews/idINIndia-40017620090601
# http://bdnews24.com/details.php?id=85889&cid=2
#
# Our wrap-up:
-# http://www.timeanddate.com/news/time/bangladesh-daylight-saving-2009.html
+# https://www.timeanddate.com/news/time/bangladesh-daylight-saving-2009.html
# From A. N. M. Kamrus Saadat (2009-06-15):
# Finally we've got the official mail regarding DST start time where DST start
@@ -281,9 +285,15 @@
# Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
+# From Paul Eggert (2017-04-20):
+# Page 27 of Reed & Low (cited for Asia/Kolkata) says "Rangoon local time is
+# used upon the railways and telegraphs of Burma, and is 6h. 24m. 47s. ahead
+# of Greenwich." This refers to the period before Burma's transition to +0630,
+# a transition for which Shanks is the only source.
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Yangon 6:24:40 - LMT 1880 # or Rangoon
- 6:24:40 - RMT 1920 # Rangoon Mean Time?
+Zone Asia/Yangon 6:24:47 - LMT 1880 # or Rangoon
+ 6:24:47 - RMT 1920 # Rangoon local time
6:30 - +0630 1942 May
9:00 - +09 1945 May 3
6:30 - +0630
@@ -340,7 +350,7 @@
#
# From Jesper Nørgaard Welen (2006-07-14):
# I have investigated the timezones around 1970 on the
-# http://www.astro.com/atlas site [with provinces and county
+# https://www.astro.com/atlas site [with provinces and county
# boundaries summarized below].... A few other exceptions were two
# counties on the Sichuan side of the Xizang-Sichuan border,
# counties Dege and Baiyu which lies on the Sichuan side and are
@@ -492,7 +502,7 @@
# From David Cochrane (2014-03-26):
# Just a confirmation that Ürümqi time was implemented in Ürümqi on 1 Feb 1986:
-# http://content.time.com/time/magazine/article/0,9171,960684,00.html
+# https://content.time.com/time/magazine/article/0,9171,960684,00.html
# From Luther Ma (2014-04-22):
# I have interviewed numerous people of various nationalities and from
@@ -649,7 +659,7 @@
# (both in Okinawa) adopt the Western Standard Time which is based on
# 120E. The adoption began from Jan 1, 1896. The original text can be
# found on Wikisource:
-# http://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
+# https://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
# ... This could be the first adoption of time zone in Taiwan, because
# during the Qing Dynasty, it seems that there was no time zone
# declared officially.
@@ -662,7 +672,7 @@
# territory, including later occupations, adopt Japan Central Time
# (UTC+9). The adoption began on Oct 1, 1937. The original text can
# be found on Wikisource:
-# http://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
+# https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
#
# That is, the time zone of Taipei switched to UTC+9 on Oct 1, 1937.
@@ -798,6 +808,12 @@
# Looks like the time zone split in Cyprus went through last night.
# http://cyprus-mail.com/2016/10/30/cyprus-new-division-two-time-zones-now-reality/
+# From Paul Eggert (2017-10-18):
+# Northern Cyprus will reinstate winter time on October 29, thus
+# staying in sync with the rest of Cyprus. See: Anastasiou A.
+# Cyprus to remain united in time. Cyprus Mail 2017-10-17.
+# https://cyprus-mail.com/2017/10/17/cyprus-remain-united-time/
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Cyprus 1975 only - Apr 13 0:00 1:00 S
Rule Cyprus 1975 only - Oct 12 0:00 0 -
@@ -815,7 +831,8 @@
Zone Asia/Famagusta 2:15:48 - LMT 1921 Nov 14
2:00 Cyprus EE%sT 1998 Sep
2:00 EUAsia EE%sT 2016 Sep 8
- 3:00 - +03
+ 3:00 - +03 2017 Oct 29 1:00u
+ 2:00 EUAsia EE%sT
# Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
# However, for various reasons many users expect to find it under Europe.
@@ -875,7 +892,7 @@
# From João Carrascalão, brother of the former governor of East Timor, in
# East Timor may be late for its millennium
-# <http://etan.org/et99c/december/26-31/30ETMAY.htm> (1999-12-26/31):
+# <https://etan.org/et99c/december/26-31/30ETMAY.htm> (1999-12-26/31):
# Portugal tried to change the time forward in 1974 because the sun
# rises too early but the suggestion raised a lot of problems with the
# Timorese and I still don't think it would work today because it
@@ -903,21 +920,62 @@
# India
# From Ian P. Beacock, in "A brief history of (modern) time", The Atlantic
-# http://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
+# https://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
# (2015-12-22):
# In January 1906, several thousand cotton-mill workers rioted on the
# outskirts of Bombay.... They were protesting the proposed abolition of
# local time in favor of Indian Standard Time.... Journalists called this
# dispute the "Battle of the Clocks." It lasted nearly half a century.
+# From Paul Eggert (2017-04-20):
+# Good luck trying to nail down old timekeeping records in India.
+# "... in the nineteenth century ... Madras Observatory took its magnetic
+# measurements on Göttingen time, its meteorological measurements on Madras
+# (local) time, dropped its time ball on Greenwich (ocean navigator's) time,
+# and distributed civil (local time)." -- Bartky IR. Selling the true time:
+# 19th-century timekeeping in america. Stanford U Press (2000), 247 note 19.
+# "A more potent cause of resistance to the general adoption of the present
+# standard time lies in the fact that it is Madras time. The citizen of
+# Bombay, proud of being 'primus in Indis' and of Calcutta, equally proud of
+# his city being the Capital of India, and - for a part of the year - the Seat
+# of the Supreme Government, alike look down on Madras, and refuse to change
+# the time they are using, for that of what they regard as a benighted
+# Presidency; while Madras, having for long given the standard time to the
+# rest of India, would resist the adoption of any other Indian standard in its
+# place." -- Oldham RD. On Time in India: a suggestion for its improvement.
+# Proceedings of the Asiatic Society of Bengal (April 1899), 49-55.
+#
+# "In 1870 ... Madras time - 'now used by the telegraph and regulated from the
+# only government observatory' - was suggested as a standard railway time,
+# first to be adopted on the Great Indian Peninsular Railway (GIPR)....
+# Calcutta, Bombay, and Karachi, were to be allowed to continue with their
+# local time for civil purposes." - Prasad R. Tracks of Change: Railways and
+# Everyday Life in Colonial India. Cambridge University Press (2016), 145.
+#
+# Reed S, Low F. The Indian Year Book 1936-37. Bennett, Coleman, pp 27-8.
+# https://archive.org/details/in.ernet.dli.2015.282212
+# This lists +052110 as Madras local time used in railways, and says that on
+# 1906-01-01 railways and telegraphs in India switched to +0530. Some
+# municipalities retained their former time, and the time in Calcutta
+# continued to depend on whether you were at the railway station or at
+# government offices. Government time was at +055320 (according to Shanks) or
+# at +0554 (according to the Indian Year Book). Railway time is more
+# appropriate for our purposes, as it was better documented, it is what we do
+# elsewhere (e.g., Europe/London before 1880), and after 1906 it was
+# consistent in the region now identified by Asia/Kolkata. So, use railway
+# time for 1870-1941. Shanks is our only (and dubious) source for the
+# 1941-1945 data.
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata
- 5:53:20 - HMT 1941 Oct # Howrah Mean Time?
- 6:30 - +0630 1942 May 15
+Zone Asia/Kolkata 5:53:28 - LMT 1854 Jun 28 # Kolkata
+ 5:53:20 - HMT 1870 # Howrah Mean Time?
+ 5:21:10 - MMT 1906 Jan 1 # Madras local time
+ 5:30 - IST 1941 Oct
+ 5:30 1:00 +0630 1942 May 15
5:30 - IST 1942 Sep
5:30 1:00 +0630 1945 Oct 15
5:30 - IST
-# The following are like Asia/Kolkata:
+# Since 1970 the following are like Asia/Kolkata:
# Andaman Is
# Lakshadweep (Laccadive, Minicoy and Amindivi Is)
# Nicobar Is
@@ -1059,7 +1117,7 @@
# From Reuters (2007-09-16), with a heads-up from Jesper Nørgaard Welen:
# ... the Guardian Council ... approved a law on Sunday to re-introduce
# daylight saving time ...
-# http://uk.reuters.com/article/oilRpt/idUKBLA65048420070916
+# https://uk.reuters.com/article/oilRpt/idUKBLA65048420070916
#
# From Roozbeh Pournader (2007-11-05):
# This is quoted from Official Gazette of the Islamic Republic of
@@ -1158,7 +1216,7 @@
# http://www.aswataliraq.info/look/article.tpl?id=2047&IdLanguage=17&IdPublication=4&NrArticle=71743&NrIssue=1&NrSection=10
#
# We have published a short article in English about the change:
-# http://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
+# https://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Iraq 1982 only - May 1 0:00 1:00 D
@@ -1466,12 +1524,12 @@
# From Yu-Cheng Chuang (2013-07-12):
# ...the Meiji Emperor announced Ordinance No. 167 of Meiji Year 28 "The clause
# about standard time" ... The adoption began from Jan 1, 1896.
-# http://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
+# https://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
#
# ...the Showa Emperor announced Ordinance No. 529 of Showa Year 12 ... which
# means the whole Japan territory, including later occupations, adopt Japan
# Central Time (UTC+9). The adoption began on Oct 1, 1937.
-# http://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
+# https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u
@@ -1533,7 +1591,7 @@
# Official, in Arabic:
# http://www.petra.gov.jo/public_news/Nws_NewsDetails.aspx?Menu_ID=&Site_Id=2&lang=1&NewsID=133230&CatID=14
# ... Our background/permalink about it
-# http://www.timeanddate.com/news/time/jordan-reverses-dst-decision.html
+# https://www.timeanddate.com/news/time/jordan-reverses-dst-decision.html
# ...
# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?lang=2&site_id=1&NewsID=133313&Type=P
# ... says midnight for the coming one and 1:00 for the ones in the future
@@ -1891,9 +1949,9 @@
# between 1987 and 1988 ...
# From Sanghyuk Jung (2014-10-29):
-# http://mm.icann.org/pipermail/tz/2014-October/021830.html
+# https://mm.icann.org/pipermail/tz/2014-October/021830.html
# According to the Korean Wikipedia
-# http://ko.wikipedia.org/wiki/한국_표준시
+# https://ko.wikipedia.org/wiki/한국_표준시
# [oldid=12896437 2014-09-04 08:03 UTC]
# DST in Republic of Korea was as follows.... And I checked old
# newspapers in Korean, all articles correspond with data in Wikipedia.
@@ -2115,7 +2173,7 @@
# +08:00 instead. Different sources appear to disagree with the tz
# database on this, e.g.:
#
-# http://www.timeanddate.com/worldclock/city.html?n=1026
+# https://www.timeanddate.com/worldclock/city.html?n=1026
# http://www.worldtimeserver.com/current_time_in_MN.aspx
#
# both say GMT+08:00.
@@ -2245,7 +2303,7 @@
# help reduce load shedding by approving the closure of commercial centres at
# 9pm and moving clocks forward by one hour for the next three months. ...."
#
-# http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html
+# http://www.worldtimezone.com/dst_news/dst_news_pakistan01.html
# http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4
# From Arthur David Olson (2008-05-19):
@@ -2311,7 +2369,7 @@
#
# We have confirmed this year's end date with both with the Ministry of
# Water and Power and the Pakistan Electric Power Company:
-# http://www.timeanddate.com/news/time/pakistan-ends-dst09.html
+# https://www.timeanddate.com/news/time/pakistan-ends-dst09.html
# From Christoph Göhre (2009-10-01):
# [T]he German Consulate General in Karachi reported me today that Pakistan
@@ -2493,7 +2551,7 @@
#
# We are not sure if Gaza will do the same, last year they had a different
# end date, we will keep this page updated:
-# http://www.timeanddate.com/news/time/westbank-gaza-dst-2009.html
+# https://www.timeanddate.com/news/time/westbank-gaza-dst-2009.html
# From Alexander Krivenyshev (2009-09-02):
# Seems that Gaza Strip will go back to Winter Time same date as West Bank.
@@ -2531,7 +2589,7 @@
# the clocks were set back one hour at 2010-08-11 00:00:00 local time in
# Gaza and the West Bank.
# Some more background info:
-# http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html
+# https://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html
# From Steffen Thorsen (2011-08-26):
# Gaza and the West Bank did go back to standard time in the beginning of
@@ -2541,7 +2599,7 @@
#
# http://www.maannews.net/eng/ViewDetails.aspx?ID=416217
# Additional info:
-# http://www.timeanddate.com/news/time/palestine-dst-2011.html
+# https://www.timeanddate.com/news/time/palestine-dst-2011.html
# From Alexander Krivenyshev (2011-08-27):
# According to the article in The Jerusalem Post:
@@ -2551,7 +2609,7 @@
# The Hamas government said on Saturday that it won't observe summertime after
# the Muslim feast of Id al-Fitr, which begins on Tuesday..."
# ...
-# http://www.jpost.com/MiddleEast/Article.aspx?id=235650
+# https://www.jpost.com/MiddleEast/Article.aspx?id=235650
# http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html
# The rules for Egypt are stolen from the 'africa' file.
@@ -2572,7 +2630,7 @@
# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html
#
# Our brief summary:
-# http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
+# https://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
# From Steffen Thorsen (2013-03-26):
# The following news sources tells that Palestine will "start daylight saving
@@ -2592,11 +2650,11 @@
# From Steffen Thorsen (2015-03-03):
# Sources such as http://www.alquds.com/news/article/view/id/548257
-# and http://www.raya.ps/ar/news/890705.html say Palestine areas will
+# and https://www.raya.ps/ar/news/890705.html say Palestine areas will
# start DST on 2015-03-28 00:00 which is one day later than expected.
#
# From Paul Eggert (2015-03-03):
-# http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
+# https://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
# says that the fall 2014 transition was Oct 23 at 24:00.
# From Hannah Kreitem (2016-03-09):
@@ -2620,8 +2678,8 @@
#
# From Paul Eggert (2016-10-19):
# It's also consistent with predictions in the following URLs today:
-# http://www.timeanddate.com/time/change/gaza-strip/gaza
-# http://www.timeanddate.com/time/change/west-bank/hebron
+# https://www.timeanddate.com/time/change/gaza-strip/gaza
+# https://www.timeanddate.com/time/change/west-bank/hebron
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
@@ -2684,7 +2742,7 @@
# Philippines, issued a proclamation announcing that 1844-12-30 was to
# be immediately followed by 1845-01-01; see R.H. van Gent's
# History of the International Date Line
-# http://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm
+# https://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm
# The rest of the data entries are from Shanks & Pottenger.
# From Jesper Nørgaard Welen (2006-04-26):
@@ -2948,7 +3006,7 @@
# We have not found any sources saying anything about when DST ends this year.
#
# Our summary
-# http://www.timeanddate.com/news/time/syria-dst-starts-march-27-2009.html
+# https://www.timeanddate.com/news/time/syria-dst-starts-march-27-2009.html
# From Steffen Thorsen (2009-10-27):
# The Syrian Arab News Network on 2009-09-29 reported that Syria will
@@ -2975,7 +3033,7 @@
# http://www.sana.sy/ara/2/2012/03/26/408215.htm
#
# Our brief summary:
-# http://www.timeanddate.com/news/time/syria-dst-2012.html
+# https://www.timeanddate.com/news/time/syria-dst-2012.html
# From Arthur David Olson (2012-03-27):
# Assume last Friday in March going forward XXX.
@@ -3058,7 +3116,7 @@
# is quoted verbatim in:
# http://www.thoigian.com.vn/?mPage=P80D01
# is translated by Brian Inglis in:
-# http://mm.icann.org/pipermail/tz/2014-October/021654.html
+# https://mm.icann.org/pipermail/tz/2014-October/021654.html
# and is the basis for the information below.
#
# The 1906 transition was effective July 1 and standardized Indochina to
--- a/make/data/tzdata/australasia Mon Nov 13 12:10:49 2017 -0800
+++ b/make/data/tzdata/australasia Mon Nov 13 13:18:35 2017 -0800
@@ -316,7 +316,7 @@
# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=1096:3310-cabinet-approves-change-in-daylight-savings-dates&catid=49:cabinet-releases&Itemid=166
#
# A bit more background info here:
-# http://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html
+# https://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html
# From Alexander Krivenyshev (2010-10-24):
# According to Radio Fiji and Fiji Times online, Fiji will end DST 3
@@ -380,9 +380,12 @@
# clocks go forward an hour at 2am to 3am.... Daylight Saving will
# end at 3.00am on Sunday 15th January 2017."
-# From Paul Eggert (2016-10-03):
-# For now, guess DST from 02:00 the first Sunday in November to
-# 03:00 the third Sunday in January. Although ad hoc, it matches
+# From Paul Eggert (2017-08-21):
+# Dominic Fok writes (2017-08-20) that DST ends 2018-01-14, citing
+# Extraordinary Government of Fiji Gazette Supplement No. 21 (2017-08-27),
+# [Legal Notice No. 41] of an order of the previous day by J Usamate.
+# For now, guess DST from 02:00 the first Sunday in November to 03:00
+# the first Sunday on or after January 14. Although ad hoc, it matches
# transitions since late 2014 and seems more likely to match future
# practice than guessing no DST.
@@ -396,7 +399,7 @@
Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 -
Rule Fiji 2014 only - Jan Sun>=18 2:00 0 -
Rule Fiji 2014 max - Nov Sun>=1 2:00 1:00 S
-Rule Fiji 2015 max - Jan Sun>=15 3:00 0 -
+Rule Fiji 2015 max - Jan Sun>=14 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
12:00 Fiji +12/+13
@@ -580,7 +583,7 @@
# The World War II entries below are instead based on Arawa-Kieta.
# The Japanese occupied Kieta in July 1942,
# according to the Pacific War Online Encyclopedia
-# http://pwencycl.kgbudge.com/B/o/Bougainville.htm
+# https://pwencycl.kgbudge.com/B/o/Bougainville.htm
# and seem to have controlled it until their 1945-08-21 surrender.
#
# The Autonomous Region of Bougainville switched from UT +10 to +11
@@ -602,7 +605,7 @@
-8:00 - -08
# American Samoa
-Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5
+Zone Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5
-11:22:48 - LMT 1911
-11:00 - SST # S=Samoa
Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
@@ -618,7 +621,7 @@
# Sunday of April 2011."
#
# Background info:
-# http://www.timeanddate.com/news/time/samoa-dst-plan-2009.html
+# https://www.timeanddate.com/news/time/samoa-dst-plan-2009.html
#
# Samoa's Daylight Saving Time Act 2009 is available here, but does not
# contain any dates:
@@ -682,7 +685,7 @@
Rule WS 2012 max - Apr Sun>=1 4:00 0 S
Rule WS 2012 max - Sep lastSun 3:00 1 D
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5
+Zone Pacific/Apia 12:33:04 - LMT 1892 Jul 5
-11:26:56 - LMT 1911
-11:30 - -1130 1950
-11:00 WS -11/-10 2011 Dec 29 24:00
@@ -709,7 +712,7 @@
# From Paul Eggert (2012-07-25)
# A Google Books snippet of Appendix to the Journals of the House of
# Representatives of New Zealand, Session 1948,
-# <http://books.google.com/books?id=ZaVCAQAAIAAJ>, page 65, says Tokelau
+# <https://books.google.com/books?id=ZaVCAQAAIAAJ>, page 65, says Tokelau
# was "11 hours slow on G.M.T." Go with Thorsen and assume Shanks & Pottenger
# are off by an hour starting in 1901.
@@ -724,8 +727,8 @@
Rule Tonga 2000 only - Mar 19 2:00s 0 -
Rule Tonga 2000 2001 - Nov Sun>=1 2:00 1:00 S
Rule Tonga 2001 2002 - Jan lastSun 2:00 0 -
-Rule Tonga 2016 max - Nov Sun>=1 2:00 1:00 S
-Rule Tonga 2017 max - Jan Sun>=15 3:00 0 -
+Rule Tonga 2016 only - Nov Sun>=1 2:00 1:00 S
+Rule Tonga 2017 only - Jan Sun>=15 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Tongatapu 12:19:20 - LMT 1901
12:20 - +1220 1941
@@ -779,7 +782,7 @@
# Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin,
# "The United States High-Altitude Test Experience: A Review Emphasizing the
# Impact on the Environment", Los Alamos LA-6405, Oct 1976.
-# http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf
+# https://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf
# See the table on page 4 where he lists GMT and local times for the tests; a
# footnote for the JI tests reads that local time is "JI time = Hawaii Time
# Minus One Hour".
@@ -845,7 +848,7 @@
#
# For data circa 1899, a common source is:
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
+# https://www.jstor.org/stable/1774359
#
# A reliable and entertaining source about time zones is
# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
@@ -992,7 +995,7 @@
# AEST ACST AWST AEDT ACDT
#
# Parliamentary Library (2008-11-10)
-# http://www.aph.gov.au/binaries/library/pubs/rp/2008-09/09rp14.pdf
+# https://www.aph.gov.au/binaries/library/pubs/rp/2008-09/09rp14.pdf
# EST CST WST preferred for standard time; AEST AEDT ACST ACDT also used
#
# The Transport Safety Bureau has an extensive series of accident reports,
@@ -1028,13 +1031,13 @@
#
# NSW (including LHI and Broken Hill):
# Standard Time Act 1987 (updated 1995-04-04)
-# http://www.austlii.edu.au/au/legis/nsw/consol_act/sta1987137/index.html
+# https://www.austlii.edu.au/au/legis/nsw/consol_act/sta1987137/index.html
# ACT
# Standard Time and Summer Time Act 1972
-# http://www.austlii.edu.au/au/legis/act/consol_act/stasta1972279/index.html
+# https://www.austlii.edu.au/au/legis/act/consol_act/stasta1972279/index.html
# SA
# Standard Time Act, 1898
-# http://www.austlii.edu.au/au/legis/sa/consol_act/sta1898137/index.html
+# https://www.austlii.edu.au/au/legis/sa/consol_act/sta1898137/index.html
# From David Grosz (2005-06-13):
# It was announced last week that Daylight Saving would be extended by
@@ -1329,7 +1332,7 @@
# http://abc.net.au/news/regionals/neweng/monthly/regeng-22jul1999-1.htm
# (1999-07-22). For now, we'll wait to see if this really happens.
#
-# Victoria will following NSW. See:
+# Victoria will follow NSW. See:
# Vic to extend daylight saving (1999-07-28)
# http://abc.net.au/local/news/olympics/1999/07/item19990728112314_1.htm
#
@@ -1432,7 +1435,7 @@
# the ACT for all 52 weeks of the year...
#
# We have a wrap-up here:
-# http://www.timeanddate.com/news/time/south-australia-extends-dst.html
+# https://www.timeanddate.com/news/time/south-australia-extends-dst.html
###############################################################################
# New Zealand
@@ -1486,7 +1489,7 @@
# From Paul Eggert (2014-07-14):
# Chatham Island time was formally standardized on 1957-01-01 by
# New Zealand's Standard Time Amendment Act 1956 (1956-10-26).
-# http://www.austlii.edu.au/nz/legis/hist_act/staa19561956n100244.pdf
+# https://www.austlii.edu.au/nz/legis/hist_act/staa19561956n100244.pdf
# According to Google Books snippet view, a speaker in the New Zealand
# parliamentary debates in 1956 said "Clause 78 makes provision for standard
# time in the Chatham Islands. The time there is 45 minutes in advance of New
@@ -1601,7 +1604,7 @@
# the Norfolk Island Museum and the Australian Bureau of Meteorology's
# Norfolk Island station, and found no record of Norfolk observing DST
# other than in 1974/5. See:
-# http://www.timeanddate.com/time/australia/norfolk-island.html
+# https://www.timeanddate.com/time/australia/norfolk-island.html
# Pitcairn
@@ -1629,11 +1632,13 @@
# (Western) Samoa and American Samoa
-# Howse writes (p 153, citing p 10 of the 1883-11-18 New York Herald)
-# that in 1879 the King of Samoa decided to change
+# Howse writes (p 153) that after the 1879 standardization on Antipodean
+# time by the British governor of Fiji, the King of Samoa decided to change
# "the date in his kingdom from the Antipodean to the American system,
# ordaining - by a masterpiece of diplomatic flattery - that
# the Fourth of July should be celebrated twice in that year."
+# This happened in 1892, according to the Evening News (Sydney) of 1892-07-20.
+# https://www.staff.science.uu.nl/~gent0113/idl/idl.htm
# Although Shanks & Pottenger says they both switched to UT -11:30
# in 1911, and to -11 in 1950. many earlier sources give -11
@@ -1644,6 +1649,7 @@
# day in 2011. Assume also that the Samoas follow the US and New
# Zealand's "ST"/"DT" style of daylight-saving abbreviations.
+
# Tonga
# From Paul Eggert (1996-01-22):
@@ -1738,6 +1744,15 @@
# Assume Tonga will observe DST from the first Sunday in November at 02:00
# through the third Sunday in January at 03:00, like Fiji, for now.
+# From David Wade (2017-10-18):
+# In August government was disolved by the King. The current prime minister
+# continued in office in care taker mode. It is easy to see that few
+# decisions will be made until elections 16th November.
+#
+# From Paul Eggert (2017-10-18):
+# For now, guess that DST is discontinued. That's what the IATA is guessing.
+
+
# Wake
# From Vernice Anderson, Personal Secretary to Philip Jessup,
@@ -1750,7 +1765,7 @@
# making calculation of time in Washington difficult if not almost
# impossible.
#
-# http://www.trumanlibrary.org/wake/meeting.htm
+# https://www.trumanlibrary.org/oralhist/andrsonv.htm
# From Paul Eggert (2003-03-23):
# We have no other report of DST in Wake Island, so omit this info for now.
@@ -1778,7 +1793,7 @@
# an international standard, there are some places on the high seas where the
# correct date is ambiguous.
-# From Wikipedia <http://en.wikipedia.org/wiki/Time_zone> (2005-08-31):
+# From Wikipedia <https://en.wikipedia.org/wiki/Time_zone> (2005-08-31):
# Before 1920, all ships kept local apparent time on the high seas by setting
# their clocks at night or at the morning sight so that, given the ship's
# speed and direction, it would be 12 o'clock when the Sun crossed the ship's
--- a/make/data/tzdata/backward Mon Nov 13 12:10:49 2017 -0800
+++ b/make/data/tzdata/backward Mon Nov 13 13:18:35 2017 -0800
@@ -84,7 +84,9 @@
Link America/Manaus Brazil/West
Link America/Halifax Canada/Atlantic
Link America/Winnipeg Canada/Central
-Link America/Regina Canada/East-Saskatchewan
+# This line is commented out, as the name exceeded the 14-character limit
+# and was an unused misnomer.
+#Link America/Regina Canada/East-Saskatchewan
Link America/Toronto Canada/Eastern
Link America/Edmonton Canada/Mountain
Link America/St_Johns Canada/Newfoundland
--- a/make/data/tzdata/europe Mon Nov 13 12:10:49 2017 -0800
+++ b/make/data/tzdata/europe Mon Nov 13 13:18:35 2017 -0800
@@ -60,14 +60,14 @@
# [PDF] (1914-03)
#
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
-# <http://www.jstor.org/stable/1774359>. He writes:
+# <https://www.jstor.org/stable/1774359>. He writes:
# "It is requested that corrections and additions to these tables
# may be sent to Mr. John Milne, Royal Geographical Society,
# Savile Row, London." Nowadays please email them to tz@iana.org.
#
# Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
# This Russian-language source was consulted by Vladimir Karpinsky; see
-# http://mm.icann.org/pipermail/tz/2014-August/021320.html
+# https://mm.icann.org/pipermail/tz/2014-August/021320.html
# The full Russian citation is:
# Бялокоз, Евгений Людвигович. Новый счет времени в течении суток
# введенный декретом Совета народных комиссаров для всей России с 1-го
@@ -210,7 +210,7 @@
# foundations of civilization throughout the world.
# -- "A Silent Toast to William Willett", Pictorial Weekly;
# republished in Finest Hour (Spring 2002) 1(114):26
-# http://www.winstonchurchill.org/images/finesthour/Vol.01%20No.114.pdf
+# https://www.winstonchurchill.org/publications/finest-hour/finest-hour-114/a-silent-toast-to-william-willett-by-winston-s-churchill
# From Paul Eggert (2015-08-08):
# The OED Supplement says that the English originally said "Daylight Saving"
@@ -248,8 +248,8 @@
# official designation; the reply of the 21st was that there wasn't
# but he couldn't think of anything better than the "Double British
# Summer Time" that the BBC had been using informally.
-# http://www.polyomino.org.uk/british-time/bbc-19410418.png
-# http://www.polyomino.org.uk/british-time/ho-19410421.png
+# https://www.polyomino.org.uk/british-time/bbc-19410418.png
+# https://www.polyomino.org.uk/british-time/ho-19410421.png
# From Sir Alexander Maxwell in the above-mentioned letter (1941-04-21):
# [N]o official designation has as far as I know been adopted for the time
@@ -266,13 +266,13 @@
# the history of summer time legislation in the United Kingdom.
# Since 1998 Joseph S. Myers has been updating
# and extending this list, which can be found in
-# http://www.polyomino.org.uk/british-time/
+# https://www.polyomino.org.uk/british-time/
# From Joseph S. Myers (1998-01-06):
#
# The legal time in the UK outside of summer time is definitely GMT, not UTC;
# see Lord Tanlaw's speech
-# http://www.publications.parliament.uk/pa/ld199798/ldhansrd/vo970611/text/70611-10.htm#70611-10_head0
+# https://www.publications.parliament.uk/pa/ld199798/ldhansrd/vo970611/text/70611-10.htm#70611-10_head0
# (Lords Hansard 11 June 1997 columns 964 to 976).
# From Paul Eggert (2006-03-22):
@@ -318,7 +318,7 @@
# Irish 'public feeling (was) outraged by forcing of English time on us'."
# -- Parsons M. Dublin lost its time zone - and 25 minutes - after 1916 Rising.
# Irish Times 2014-10-27.
-# http://www.irishtimes.com/news/politics/dublin-lost-its-time-zone-and-25-minutes-after-1916-rising-1.1977411
+# https://www.irishtimes.com/news/politics/dublin-lost-its-time-zone-and-25-minutes-after-1916-rising-1.1977411
# From Joseph S. Myers (2005-01-26):
# Irish laws are available online at <http://www.irishstatutebook.ie>.
@@ -371,6 +371,12 @@
# Justice (tel +353 1 678 9711) who confirmed to me that the correct name is
# "Irish Summer Time", abbreviated to "IST".
+# Michael Deckers (2017-06-01) gave the following URLs for Ireland's
+# Summer Time Act, 1925 and Summer Time Orders, 1926 and 1947:
+# http://www.irishstatutebook.ie/eli/1925/act/8/enacted/en/print.html
+# http://www.irishstatutebook.ie/eli/1926/sro/919/made/en/print.html
+# http://www.irishstatutebook.ie/eli/1947/sro/71/made/en/print.html
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
# Summer Time Act, 1916
Rule GB-Eire 1916 only - May 21 2:00s 1:00 BST
@@ -495,14 +501,14 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Dublin -0:25:00 - LMT 1880 Aug 2
- -0:25:21 - DMT 1916 May 21 2:00 # Dublin MT
+ -0:25:21 - DMT 1916 May 21 2:00s # Dublin MT
-0:25:21 1:00 IST 1916 Oct 1 2:00s
0:00 GB-Eire %s 1921 Dec 6 # independence
- 0:00 GB-Eire GMT/IST 1940 Feb 25 2:00
- 0:00 1:00 IST 1946 Oct 6 2:00
- 0:00 - GMT 1947 Mar 16 2:00
- 0:00 1:00 IST 1947 Nov 2 2:00
- 0:00 - GMT 1948 Apr 18 2:00
+ 0:00 GB-Eire GMT/IST 1940 Feb 25 2:00s
+ 0:00 1:00 IST 1946 Oct 6 2:00s
+ 0:00 - GMT 1947 Mar 16 2:00s
+ 0:00 1:00 IST 1947 Nov 2 2:00s
+ 0:00 - GMT 1948 Apr 18 2:00s
0:00 GB-Eire GMT/IST 1968 Oct 27
1:00 - IST 1971 Oct 31 2:00u
0:00 GB-Eire GMT/IST 1996
@@ -648,7 +654,7 @@
# Council of Ministers of the USSR from 1989-03-14 No. 227.
#
# I did not find full texts of these acts. For the 1989 one we have
-# title at http://base.garant.ru/70754136/ :
+# title at https://base.garant.ru/70754136/ :
# "About change in calculation of time on the territories of
# Lithuanian SSR, Latvian SSR and Estonian SSR, Astrakhan,
# Kaliningrad, Kirov, Kuybyshev, Ulyanovsk and Uralsk oblasts".
@@ -679,7 +685,7 @@
# http://bmockbe.ru/events/?ID=7583
#
# Medvedev signed a law on the calculation of the time (in russian):
-# http://www.regnum.ru/news/polit/1413906.html
+# https://www.regnum.ru/news/polit/1413906.html
# From Arthur David Olson (2011-06-15):
# Take "abolishing daylight saving time" to mean that time is now considered
@@ -806,7 +812,7 @@
# Sources (Russian language):
# http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
# http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
-# http://news.tut.by/society/250578.html
+# https://news.tut.by/society/250578.html
#
# From Alexander Bokovoy (2014-10-09):
# Belarussian government decided against changing to winter time....
@@ -1127,7 +1133,7 @@
# for their standard and summer times. He says no, they use "suveaeg"
# (summer time) and "talveaeg" (winter time).
-# From The Baltic Times <http://www.baltictimes.com/> (1999-09-09)
+# From The Baltic Times <https://www.baltictimes.com/> (1999-09-09)
# via Steffen Thorsen:
# This year will mark the last time Estonia shifts to summer time,
# a council of the ruling coalition announced Sept. 6....
@@ -1179,7 +1185,7 @@
# This is documented in Heikki Oja: Aikakirja 2007, published by The Almanac
# Office of University of Helsinki, ISBN 952-10-3221-9, available online (in
# Finnish) at
-# http://almanakka.helsinki.fi/aikakirja/Aikakirja2007kokonaan.pdf
+# https://almanakka.helsinki.fi/aikakirja/Aikakirja2007kokonaan.pdf
#
# Page 105 (56 in PDF version) has a handy table of all past daylight savings
# transitions. It is easy enough to interpret without Finnish skills.
@@ -1192,7 +1198,7 @@
# From Konstantin Hyppönen (2014-06-13):
# [Heikki Oja's book Aikakirja 2013]
-# http://almanakka.helsinki.fi/images/aikakirja/Aikakirja2013kokonaan.pdf
+# https://almanakka.helsinki.fi/images/aikakirja/Aikakirja2013kokonaan.pdf
# pages 104-105, including a scan from a newspaper published on Apr 2 1942
# say that ... [o]n Apr 2 1942, 24 o'clock (which means Apr 3 1942,
# 00:00), clocks were moved one hour forward. The newspaper
@@ -1322,7 +1328,7 @@
# From Jörg Schilling (2002-10-23):
# In 1945, Berlin was switched to Moscow Summer time (GMT+4) by
-# http://www.dhm.de/lemo/html/biografien/BersarinNikolai/
+# https://www.dhm.de/lemo/html/biografien/BersarinNikolai/
# General [Nikolai] Bersarin.
# From Paul Eggert (2003-03-08):
@@ -1547,7 +1553,7 @@
# From Paul Eggert (2016-10-27):
# Go with INRiM for DST rules, except as corrected by Inglis for 1944
# for the Kingdom of Italy. This is consistent with Renzo Baldini.
-# Model Rome's occupation by using using C-Eur rules from 1943-09-10
+# Model Rome's occupation by using C-Eur rules from 1943-09-10
# to 1944-06-04; although Rome was an open city during this period, it
# was effectively controlled by Germany.
#
@@ -1862,14 +1868,14 @@
# Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)-
# Tiraspol will go back to winter time on October 30, 2011.
# News from Moldova (in russian):
-# http://ru.publika.md/link_317061.html
+# https://ru.publika.md/link_317061.html
# From Roman Tudos (2015-07-02):
# http://lex.justice.md/index.php?action=view&view=doc&lang=1&id=355077
# From Paul Eggert (2015-07-01):
# The abovementioned official link to IGO1445-868/2014 states that
# 2014-10-26's fallback transition occurred at 03:00 local time. Also,
-# http://www.trm.md/en/social/la-30-martie-vom-trece-la-ora-de-vara
+# https://www.trm.md/en/social/la-30-martie-vom-trece-la-ora-de-vara
# says the 2014-03-30 spring-forward transition was at 02:00 local time.
# Guess that since 1997 Moldova has switched one hour before the EU.
@@ -1941,7 +1947,7 @@
# Amsterdam mean time.
# The data entries before 1945 are taken from
-# http://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
+# https://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Neth 1916 only - May 1 0:00 1:00 NST # Netherlands Summer Time
@@ -2022,7 +2028,7 @@
# so it must have diverged from Oslo time during the war, as Oslo was
# keeping Berlin time.
#
-# <http://home.no.net/janmayen/history.htm> says that the meteorologists
+# <https://www.jan-mayen.no/history.htm> says that the meteorologists
# burned down their station in 1940 and left the island, but returned in
# 1941 with a small Norwegian garrison and continued operations despite
# frequent air attacks from Germans. In 1943 the Americans established a
@@ -2060,7 +2066,7 @@
Rule Poland 1945 only - Nov 1 0:00 0 -
# For 1946 on the source is Kazimierz Borkowski,
# Toruń Center for Astronomy, Dept. of Radio Astronomy, Nicolaus Copernicus U.,
-# http://www.astro.uni.torun.pl/~kb/Artykuly/U-PA/Czas2.htm#tth_tAb1
+# https://www.astro.uni.torun.pl/~kb/Artykuly/U-PA/Czas2.htm#tth_tAb1
# Thanks to Przemysław Augustyniak (2005-05-28) for this reference.
# He also gives these further references:
# Mon Pol nr 13, poz 162 (1995) <http://www.abc.com.pl/serwis/mp/1995/0162.htm>
@@ -2094,7 +2100,7 @@
#
# From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
# According to a Portuguese decree (1911-05-26)
-# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
+# https://dre.pt/application/dir/pdf1sdip/1911/05/12500/23132313.pdf
# Lisbon was at -0:36:44.68, but switched to GMT on 1912-01-01 at 00:00.
# Round the old offset to -0:36:45. This agrees with Willett but disagrees
# with Shanks, who says the transition occurred on 1911-05-24 at 00:00 for
@@ -2276,7 +2282,7 @@
# 2011 No. 725" and contains no other dates or "effective date" information.
#
# Another source is
-# http://www.rg.ru/2011/09/06/chas-zona-dok.html
+# https://rg.ru/2011/09/06/chas-zona-dok.html
# which, according to translate.google.com, begins "Resolution of the
# Government of the Russian Federation on August 31, 2011 N 725" and also
# contains "Date first official publication: September 6, 2011 Posted on:
@@ -2284,7 +2290,7 @@
# does not contain any "effective date" information.
#
# Another source is
-# http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7
+# https://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7
# which, in note 8, contains "Resolution No. 725 of August 31, 2011...
# Effective as of after 7 days following the day of the official publication"
# but which does not contain any reference to September 6, 2011.
@@ -2320,7 +2326,7 @@
# http://itar-tass.com/obschestvo/1333711
# http://www.pravo.gov.ru:8080/page.aspx?111660
# http://www.kremlin.ru/acts/46279
-# From October 26, 2014 the new Russian time zone map will looks like this:
+# From October 26, 2014 the new Russian time zone map will look like this:
# http://www.worldtimezone.com/dst_news/dst_news_russia-map-2014-07.html
# From Paul Eggert (2006-03-22):
@@ -2367,7 +2373,7 @@
# with maintenance only and represent our best guesses as to which regions
# are covered by each zone. They are not meant to be taken as an authoritative
# listing. The region codes listed come from
-# http://en.wikipedia.org/w/?title=Federal_subjects_of_Russia&oldid=611810498
+# https://en.wikipedia.org/w/?title=Federal_subjects_of_Russia&oldid=611810498
# and are used for convenience only; no guarantees are made regarding their
# future stability. ISO 3166-2:RU codes are also listed for first-level
# divisions where available.
@@ -2532,7 +2538,7 @@
# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
# says that Kaliningrad decided not to be an exception 2 days before the
# 1991-03-31 switch and one person at
-# http://izhevsk.ru/forum_light_message/50/682597-m8369040.html
+# https://izhevsk.ru/forum_light_message/50/682597-m8369040.html
# says he remembers that Samara opted out of the 1992-01-19 exception
# 2 days before the switch.
#
@@ -2604,7 +2610,7 @@
3:00 - MSK 1997 Mar lastSun 1:00u
# From Alexander Krivenyshev (2014-03-17):
# time change at 2:00 (2am) on March 30, 2014
-# http://vz.ru/news/2014/3/17/677464.html
+# https://vz.ru/news/2014/3/17/677464.html
# From Paul Eggert (2014-03-30):
# Simferopol and Sevastopol reportedly changed their central town clocks
# late the previous day, but this appears to have been ceremonial
@@ -2787,7 +2793,7 @@
# suggests that Altai Republic transitioned to Moscow+3 on
# 1995-05-28.
#
-# http://regnum.ru/news/society/1957270.html
+# https://regnum.ru/news/society/1957270.html
# has some historical data for Altai Krai:
# before 1957: west part on UTC+6, east on UTC+7
# after 1957: UTC+7
@@ -3161,8 +3167,8 @@
# districts, but have very similar populations. In fact, Wikipedia currently
# lists them both as having 3528 people, exactly 1668 males and 1860 females
# each! (Yikes!)
-# http://en.wikipedia.org/w/?title=Srednekolymsky_District&oldid=603435276
-# http://en.wikipedia.org/w/?title=Verkhnekolymsky_District&oldid=594378493
+# https://en.wikipedia.org/w/?title=Srednekolymsky_District&oldid=603435276
+# https://en.wikipedia.org/w/?title=Verkhnekolymsky_District&oldid=594378493
# Assume this is a mistake, albeit an amusing one.
#
# Looking at censuses, the populations of the two municipalities seem to have
@@ -3483,7 +3489,7 @@
#
# From Alois Treindl (2013-09-11):
# The Federal regulations say
-# http://www.admin.ch/opc/de/classified-compilation/20071096/index.html
+# https://www.admin.ch/opc/de/classified-compilation/20071096/index.html
# ... the meridian for Bern mean time ... is 7 degrees 26' 22.50".
# Expressed in time, it is 0h29m45.5s.
@@ -3560,9 +3566,9 @@
# According to the articles linked below, Turkey will change into summer
# time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27.
# This change is due to a nationwide exam on 27th.
-# http://www.worldbulletin.net/?aType=haber&ArticleID=70872
+# https://www.worldbulletin.net/?aType=haber&ArticleID=70872
# Turkish:
-# http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373
+# https://www.hurriyet.com.tr/yaz-saati-uygulamasi-bir-gun-ileri-alindi-17230464
# From Faruk Pasin (2014-02-14):
# The DST for Turkey has been changed for this year because of the
@@ -3698,7 +3704,7 @@
# http://www.segodnya.ua/news/14290482.html
#
# Deputies cancelled the winter time (in Russian)
-# http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
+# https://www.pravda.com.ua/rus/news/2011/09/20/6600616/
#
# From Philip Pizzey (2011-10-18):
# Today my Ukrainian colleagues have informed me that the
--- a/make/data/tzdata/leapseconds Mon Nov 13 12:10:49 2017 -0800
+++ b/make/data/tzdata/leapseconds Mon Nov 13 13:18:35 2017 -0800
@@ -26,19 +26,18 @@
# This file is in the public domain.
# This file is generated automatically from the data in the public-domain
-# leap-seconds.list file available from most NIST time servers.
-# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
-# you should be able to pick up leap-seconds.list from a secondary NIST server.
-# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers.
+# leap-seconds.list file, which is copied from:
+# ftp://ftp.nist.gov/pub/time/leap-seconds.list
# For more about leap-seconds.list, please see
# The NTP Timescale and Leap Seconds
-# http://www.eecis.udel.edu/~mills/leap.html
+# https://www.eecis.udel.edu/~mills/leap.html
# The International Earth Rotation and Reference Systems Service
# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
# (which measures the true angular orientation of the earth in space); see
-# Terry J Quinn, The BIPM and the accurate measure of time,
-# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>.
+# Levine J. Coordinated Universal Time and the leap second.
+# URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995
+# http://ieeexplore.ieee.org/document/7909995/
# There were no leap seconds before 1972, because the official mechanism
# accounting for the discrepancy between atomic time and the earth's rotation
# did not exist until the early 1970s.
@@ -81,5 +80,5 @@
Leap 2015 Jun 30 23:59:60 + S
Leap 2016 Dec 31 23:59:60 + S
-# Updated through IERS Bulletin C53
-# File expires on: 28 December 2017
+# Updated through IERS Bulletin C54
+# File expires on: 28 June 2018
--- a/make/data/tzdata/northamerica Mon Nov 13 12:10:49 2017 -0800
+++ b/make/data/tzdata/northamerica Mon Nov 13 13:18:35 2017 -0800
@@ -128,10 +128,13 @@
# Last night I heard part of a rebroadcast of a 1945 Arch Oboler radio drama.
# In the introduction, Oboler spoke of "Eastern Peace Time."
# An AltaVista search turned up:
-# http://rowayton.org/rhs/hstaug45.html
+# https://web.archive.org/web/20000926032210/http://rowayton.org/rhs/hstaug45.html
# "When the time is announced over the radio now, it is 'Eastern Peace
# Time' instead of the old familiar 'Eastern War Time.' Peace is wonderful."
# (August 1945) by way of confirmation.
+#
+# From Paul Eggert (2017-09-23):
+# This was the V-J Day issue of the Clamdigger, a Rowayton, CT newsletter.
# From Joseph Gallant citing
# George H. Douglas, _The Early Days of Radio Broadcasting_ (1987):
@@ -280,7 +283,7 @@
# HST and HDT are standardized abbreviations for Hawaii-Aleutian
# standard and daylight times. See section 9.47 (p 234) of the
# U.S. Government Printing Office Style Manual (2008)
-# http://www.gpo.gov/fdsys/pkg/GPO-STYLEMANUAL-2008/pdf/GPO-STYLEMANUAL-2008.pdf
+# https://www.gpo.gov/fdsys/pkg/GPO-STYLEMANUAL-2008/pdf/GPO-STYLEMANUAL-2008.pdf
# From Arthur David Olson, 2005-08-09
# The following was signed into law on 2005-08-08.
@@ -369,7 +372,7 @@
# western Tennessee, most of Texas, Wisconsin
# From Larry M. Smith (2006-04-26) re Wisconsin:
-# http://www.legis.state.wi.us/statutes/Stat0175.pdf ...
+# https://docs.legis.wisconsin.gov/statutes/statutes/175.pdf
# is currently enforced at the 01:00 time of change. Because the local
# "bar time" in the state corresponds to 02:00, a number of citations
# are issued for the "sale of class 'B' alcohol after prohibited
@@ -378,7 +381,7 @@
# From Douglas R. Bomberg (2007-03-12):
# Wisconsin has enacted (nearly eleventh-hour) legislation to get WI
# Statue 175 closer in synch with the US Congress' intent....
-# http://www.legis.state.wi.us/2007/data/acts/07Act3.pdf
+# https://docs.legis.wisconsin.gov/2007/related/acts/3
# From an email administrator of the City of Fort Pierre, SD (2015-12-21):
# Fort Pierre is technically located in the Mountain time zone as is
@@ -425,7 +428,7 @@
# ...it appears that Mercer County, North Dakota, changed from the
# mountain time zone to the central time zone at the last transition from
# daylight-saving to standard time (on Nov. 7, 2010):
-# http://www.gpo.gov/fdsys/pkg/FR-2010-09-29/html/2010-24376.htm
+# https://www.gpo.gov/fdsys/pkg/FR-2010-09-29/html/2010-24376.htm
# http://www.bismarcktribune.com/news/local/article_1eb1b588-c758-11df-b472-001cc4c03286.html
# From Andy Lipscomb (2011-01-24):
@@ -476,7 +479,7 @@
# legal time, and is not part of the data here.) See:
# Ross SA. An energy crisis from the past: Northern California in 1948.
# Working Paper No. 8, Institute of Governmental Studies, UC Berkeley,
-# 1973-11. http://escholarship.org/uc/item/8x22k30c
+# 1973-11. https://escholarship.org/uc/item/8x22k30c
#
# In another measure to save electricity, DST was instituted from 1948-03-14
# at 02:01 to 1949-01-16 at 02:00, with the governor having the option to move
@@ -497,8 +500,8 @@
# which established DST from April's last Sunday at 01:00 until September's
# last Sunday at 02:00. This was amended by 1962's Proposition 6, which changed
# the fall-back date to October's last Sunday. See:
-# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&context=ca_ballot_props
-# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&context=ca_ballot_props
+# https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&context=ca_ballot_props
+# https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&context=ca_ballot_props
#
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule CA 1948 only - Mar 14 2:01 1:00 D
@@ -515,20 +518,31 @@
# Alaska
# AK%sT is the modern abbreviation for -09 per USNO.
#
-# From Paul Eggert (2001-05-30):
+# From Paul Eggert (2017-06-15):
# Howse writes that Alaska switched from the Julian to the Gregorian calendar,
# and from east-of-GMT to west-of-GMT days, when the US bought it from Russia.
-# This was on 1867-10-18, a Friday; the previous day was 1867-10-06 Julian,
-# also a Friday. Include only the time zone part of this transition,
-# ignoring the switch from Julian to Gregorian, since we can't represent
-# the Julian calendar.
+# On Friday, 1867-10-18 (Gregorian), at precisely 15:30 local time, the
+# Russian forts and fleet at Sitka fired salutes to mark the ceremony of
+# formal transfer. See the Sacramento Daily Union (1867-11-14), p 3, col 2.
+# https://cdnc.ucr.edu/cgi-bin/cdnc?a=d&d=SDU18671114.2.12.1
+# Sitka workers did not change their calendars until Sunday, 1867-10-20,
+# and so celebrated two Sundays that week. See: Ahllund T (tr Hallamaa P).
+# From the memoirs of a Finnish workman. Alaska History. 2006 Fall;21(2):1-25.
+# http://alaskahistoricalsociety.org/wp-content/uploads/2016/12/Ahllund-2006-Memoirs-of-a-Finnish-Workman.pdf
+# Include only the time zone part of this transition, ignoring the switch
+# from Julian to Gregorian, since we can't represent the Julian calendar.
#
-# As far as we know, none of the exact locations mentioned below were
+# As far as we know, of the locations mentioned below only Sitka was
# permanently inhabited in 1867 by anyone using either calendar.
-# (Yakutat was colonized by the Russians in 1799, but the settlement
-# was destroyed in 1805 by a Yakutat-kon war party.) However, there
-# were nearby inhabitants in some cases and for our purposes perhaps
-# it's best to simply use the official transition.
+# (Yakutat was colonized by the Russians in 1799, but the settlement was
+# destroyed in 1805 by a Yakutat-kon war party.) Many of Alaska's inhabitants
+# were unaware of the US acquisition of Alaska, much less of any calendar or
+# time change. However, the Russian-influenced part of Alaska did observe
+# Russian time, and it is more accurate to model this than to ignore it.
+# The database format requires an exact transition time; use the Russian
+# salute as a somewhat-arbitrary time for the formal transfer of control for
+# all of Alaska. Sitka's UTC offset is -9:01:13; adjust its 15:30 to the
+# local times of other Alaskan locations so that they change simultaneously.
# From Paul Eggert (2014-07-18):
# One opinion of the early-1980s turmoil in Alaska over time zones and
@@ -581,10 +595,10 @@
# It seems Metlakatla did go off PST on Sunday, November 1, changing
# their time to AKST and are going to follow Alaska's DST, switching
# between AKST and AKDT from now on....
-# http://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
+# https://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Juneau 15:02:19 - LMT 1867 Oct 18
+Zone America/Juneau 15:02:19 - LMT 1867 Oct 19 15:33:32
-8:57:41 - LMT 1900 Aug 20 12:00
-8:00 - PST 1942
-8:00 US P%sT 1946
@@ -594,7 +608,7 @@
-8:00 US P%sT 1983 Oct 30 2:00
-9:00 US Y%sT 1983 Nov 30
-9:00 US AK%sT
-Zone America/Sitka 14:58:47 - LMT 1867 Oct 18
+Zone America/Sitka 14:58:47 - LMT 1867 Oct 19 15:30
-9:01:13 - LMT 1900 Aug 20 12:00
-8:00 - PST 1942
-8:00 US P%sT 1946
@@ -602,7 +616,7 @@
-8:00 US P%sT 1983 Oct 30 2:00
-9:00 US Y%sT 1983 Nov 30
-9:00 US AK%sT
-Zone America/Metlakatla 15:13:42 - LMT 1867 Oct 18
+Zone America/Metlakatla 15:13:42 - LMT 1867 Oct 19 15:44:55
-8:46:18 - LMT 1900 Aug 20 12:00
-8:00 - PST 1942
-8:00 US P%sT 1946
@@ -610,14 +624,14 @@
-8:00 US P%sT 1983 Oct 30 2:00
-8:00 - PST 2015 Nov 1 2:00
-9:00 US AK%sT
-Zone America/Yakutat 14:41:05 - LMT 1867 Oct 18
+Zone America/Yakutat 14:41:05 - LMT 1867 Oct 19 15:12:18
-9:18:55 - LMT 1900 Aug 20 12:00
-9:00 - YST 1942
-9:00 US Y%sT 1946
-9:00 - YST 1969
-9:00 US Y%sT 1983 Nov 30
-9:00 US AK%sT
-Zone America/Anchorage 14:00:24 - LMT 1867 Oct 18
+Zone America/Anchorage 14:00:24 - LMT 1867 Oct 19 14:31:37
-9:59:36 - LMT 1900 Aug 20 12:00
-10:00 - AST 1942
-10:00 US A%sT 1967 Apr
@@ -625,7 +639,7 @@
-10:00 US AH%sT 1983 Oct 30 2:00
-9:00 US Y%sT 1983 Nov 30
-9:00 US AK%sT
-Zone America/Nome 12:58:21 - LMT 1867 Oct 18
+Zone America/Nome 12:58:22 - LMT 1867 Oct 19 13:29:35
-11:01:38 - LMT 1900 Aug 20 12:00
-11:00 - NST 1942
-11:00 US N%sT 1946
@@ -634,7 +648,7 @@
-11:00 US B%sT 1983 Oct 30 2:00
-9:00 US Y%sT 1983 Nov 30
-9:00 US AK%sT
-Zone America/Adak 12:13:21 - LMT 1867 Oct 18
+Zone America/Adak 12:13:22 - LMT 1867 Oct 19 12:44:35
-11:46:38 - LMT 1900 Aug 20 12:00
-11:00 - NST 1942
-11:00 US N%sT 1946
@@ -670,7 +684,7 @@
# "Hawaiian Time" by Robert C. Schmitt and Doak C. Cox appears on pages 207-225
# of volume 26 of The Hawaiian Journal of History (1992). As of 2010-12-09,
# the article is available at
-# http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf
+# https://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf
# and indicates that standard time was adopted effective noon, January
# 13, 1896 (page 218), that in "1933, the Legislature decreed daylight
# saving for the period between the last Sunday of each April and the
@@ -769,7 +783,7 @@
# Indiana
#
# For a map of Indiana's time zone regions, see:
-# http://en.wikipedia.org/wiki/Time_in_Indiana
+# https://en.wikipedia.org/wiki/Time_in_Indiana
#
# From Paul Eggert (2007-08-17):
# Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
@@ -996,7 +1010,7 @@
# From Paul Eggert (2001-07-16):
# The final rule was published in the
# Federal Register 65, 160 (2000-08-17), pp 50154-50158.
-# http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=2000_register&docid=fr17au00-22
+# https://www.gpo.gov/fdsys/pkg/FR-2000-08-17/html/00-20854.htm
#
Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 12:20:36
-6:00 US C%sT 1946
@@ -1022,7 +1036,7 @@
# West Wendover, NV officially switched from Pacific to mountain time on
# 1999-10-31. See the
# Federal Register 64, 203 (1999-10-21), pp 56705-56707.
-# http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=1999_register&docid=fr21oc99-15
+# https://www.gpo.gov/fdsys/pkg/FR-1999-10-21/html/99-27240.htm
# However, the Federal Register says that West Wendover already operated
# on mountain time, and the rule merely made this official;
# hence a separate tz entry is not needed.
@@ -1052,12 +1066,23 @@
# one hour in 1914." This change is not in Shanks. We have no more
# info, so omit this for now.
#
+# From Paul Eggert (2017-07-26):
+# Although Shanks says Detroit observed DST in 1967 from 06-14 00:01
+# until 10-29 00:01, I now see multiple reports that this is incorrect.
+# For example, according to a 50-year anniversary report about the 1967
+# Detroit riots and a major-league doubleheader on 1967-07-23, "By the time
+# the last fly ball of the doubleheader settled into the glove of leftfielder
+# Lenny Green, it was after 7 p.m. Detroit did not observe daylight saving
+# time, so light was already starting to fail. Twilight was made even deeper
+# by billowing columns of smoke that ascended in an unbroken wall north of the
+# ballpark." See: Dow B. Detroit '67: As violence unfolded, Tigers played two
+# at home vs. Yankees. Detroit Free Press 2017-07-23.
+# https://www.freep.com/story/sports/mlb/tigers/2017/07/23/detroit-tigers-1967-riot-new-york-yankees/499951001/
+#
# Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule Detroit 1948 only - Apr lastSun 2:00 1:00 D
Rule Detroit 1948 only - Sep lastSun 2:00 0 S
-Rule Detroit 1967 only - Jun 14 2:00 1:00 D
-Rule Detroit 1967 only - Oct lastSun 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Detroit -5:32:11 - LMT 1905
-6:00 - CST 1915 May 15 2:00
@@ -1121,7 +1146,7 @@
# [PDF] (1914-03)
#
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
-# <http://www.jstor.org/stable/1774359>.
+# <https://www.jstor.org/stable/1774359>.
#
# See the 'europe' file for Greenland.
@@ -1167,19 +1192,19 @@
# The British Columbia government announced yesterday that it will
# adjust daylight savings next year to align with changes in the
# U.S. and the rest of Canada....
-# http://www2.news.gov.bc.ca/news_releases_2005-2009/2006AG0014-000330.htm
+# https://archive.news.gov.bc.ca/releases/news_releases_2005-2009/2006AG0014-000330.htm
# ...
# Nova Scotia
# Daylight saving time will be extended by four weeks starting in 2007....
-# http://www.gov.ns.ca/just/regulations/rg2/2006/ma1206.pdf
+# https://www.novascotia.ca/just/regulations/rg2/2006/ma1206.pdf
#
# [For New Brunswick] the new legislation dictates that the time change is to
# be done at 02:00 instead of 00:01.
-# http://www.gnb.ca/0062/acts/BBA-2006/Chap-19.pdf
+# https://www.gnb.ca/0062/acts/BBA-2006/Chap-19.pdf
# ...
# Manitoba has traditionally changed the clock every fall at 03:00.
# As of 2006, the transition is to take place one hour earlier at 02:00.
-# http://web2.gov.mb.ca/laws/statutes/ccsm/o030e.php
+# https://web2.gov.mb.ca/laws/statutes/ccsm/o030e.php
# ...
# [Alberta, Ontario, Quebec] will follow US rules.
# http://www.qp.gov.ab.ca/documents/spring/CH03_06.CFM
@@ -1193,7 +1218,7 @@
# http://www.hoa.gov.nl.ca/hoa/bills/Bill0634.htm
# ...
# Yukon
-# http://www.gov.yk.ca/legislation/regs/oic2006_127.pdf
+# https://www.gov.yk.ca/legislation/regs/oic2006_127.pdf
# ...
# N.W.T. will follow US rules. Whoever maintains the government web site
# does not seem to believe in bookmarks. To see the news release, click the
@@ -1214,8 +1239,8 @@
# time and daylight saving time arrangements in Canada circa 1998.
#
# National Research Council Canada maintains info about time zones and DST.
-# http://www.nrc-cnrc.gc.ca/eng/services/time/time_zones.html
-# http://www.nrc-cnrc.gc.ca/eng/services/time/faq/index.html#Q5
+# https://www.nrc-cnrc.gc.ca/eng/services/time/time_zones.html
+# https://www.nrc-cnrc.gc.ca/eng/services/time/faq/index.html#Q5
# Its unofficial information is often taken from Matthews and Vincent.
# From Paul Eggert (2006-06-27):
@@ -1252,11 +1277,13 @@
# Newfoundland and Labrador
-# From Paul Eggert (2000-10-02):
-# Matthews and Vincent (1998) write that Labrador should use NST/NDT,
-# but the only part of Labrador that follows the rules is the
-# southeast corner, including Port Hope Simpson and Mary's Harbour,
-# but excluding, say, Black Tickle.
+# From Paul Eggert (2017-10-14):
+# Legally Labrador should observe Newfoundland time; see:
+# McLeod J. Labrador time - legal or not? St. John's Telegram, 2017-10-07
+# http://www.thetelegram.com/news/local/labrador-time--legal-or-not-154860/
+# Matthews and Vincent (1998) write that the only part of Labrador
+# that follows the rules is the southeast corner, including Port Hope
+# Simpson and Mary's Harbour, but excluding, say, Black Tickle.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule StJohns 1917 only - Apr 8 2:00 1:00 D
@@ -1456,7 +1483,7 @@
# http://www.justice.gouv.qc.ca/english/publications/generale/temps-minganie-a.htm
# that the coastal strip from just east of Natashquan to Blanc-Sablon
# observes Atlantic standard time all year round.
-# http://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en
+# https://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en
# says this common practice was codified into law as of 2007.
# For lack of better info, guess this practice began around 1970, contra to
# Shanks & Pottenger who have this region observing AST/ADT.
@@ -1488,6 +1515,11 @@
# earlier in June).
#
# Kenora, Ontario, was to abandon DST on 1914-06-01 (-05-21).
+#
+# From Paul Eggert (2017-07-08):
+# For more on Orillia, see: Daubs K. Bold attempt at daylight saving
+# time became a comic failure in Orillia. Toronto Star 2017-07-08.
+# https://www.thestar.com/news/insight/2017/07/08/bold-attempt-at-daylight-saving-time-became-a-comic-failure-in-orillia.html
# From Paul Eggert (1997-10-17):
# Mark Brader writes that an article in the 1997-10-14 Toronto Star
@@ -1979,7 +2011,7 @@
# * 1967. Paragraph 28(34)(g) of the Interpretation Act, S.C. 1967-68,
# c. 7 defines Yukon standard time as UTC-9....
# see Interpretation Act, R.S.C. 1985, c. I-21, s. 35(1).
-# [http://canlii.ca/t/7vhg]
+# [https://www.canlii.org/en/ca/laws/stat/rsc-1985-c-i-21/latest/rsc-1985-c-i-21.html]
# * C.O. 1973/214 switched Yukon to PST on 1973-10-28 00:00.
# * O.I.C. 1980/02 established DST.
# * O.I.C. 1987/056 changed DST to Apr firstSun 2:00 to Oct lastSun 2:00.
@@ -2044,7 +2076,7 @@
# hours behind Greenwich Time.
#
# * Yukon Standard Time defined as Pacific Standard Time, YCO 1973/214
-# http://www.canlii.org/en/yk/laws/regu/yco-1973-214/latest/yco-1973-214.html
+# https://www.canlii.org/en/yk/laws/regu/yco-1973-214/latest/yco-1973-214.html
# C.O. 1973/214 INTERPRETATION ACT ...
#
# 1. Effective October 28, 1973 Commissioner's Order 1967/59 is hereby
@@ -2059,7 +2091,7 @@
# http://? - no online source found
#
# * Yukon Daylight Saving Time, YOIC 1987/56
-# http://www.canlii.org/en/yk/laws/regu/yoic-1987-56/latest/yoic-1987-56.html
+# https://www.canlii.org/en/yk/laws/regu/yoic-1987-56/latest/yoic-1987-56.html
# O.I.C. 1987/056 INTERPRETATION ACT ...
#
# In every year between
@@ -2071,7 +2103,7 @@
# Dated ... 9th day of March, A.D., 1987.
#
# * Yukon Daylight Saving Time 2006, YOIC 2006/127
-# http://www.canlii.org/en/yk/laws/regu/yoic-2006-127/latest/yoic-2006-127.html
+# https://www.canlii.org/en/yk/laws/regu/yoic-2006-127/latest/yoic-2006-127.html
# O.I.C. 2006/127 INTERPRETATION ACT ...
#
# 1. In Yukon each year the time for general purposes shall be 7 hours
@@ -2085,7 +2117,7 @@
# 3. This order comes into force January 1, 2007.
#
# * Interpretation Act, RSY 2002, c 125
-# http://www.canlii.org/en/yk/laws/stat/rsy-2002-c-125/latest/rsy-2002-c-125.html
+# https://www.canlii.org/en/yk/laws/stat/rsy-2002-c-125/latest/rsy-2002-c-125.html
# From Rives McDow (1999-09-04):
# Nunavut ... moved ... to incorporate the whole territory into one time zone.
@@ -2128,7 +2160,7 @@
# From Michaela Rodrigue, writing in the
# Nunatsiaq News (1999-11-19):
-# http://www.nunatsiaq.com/archives/nunavut991130/nvt91119_17.html
+# http://www.nunatsiaqonline.ca/archives/nunavut991130/nvt91119_17.html
# Clyde River, Pangnirtung and Sanikiluaq now operate with two time zones,
# central - or Nunavut time - for government offices, and eastern time
# for municipal offices and schools.... Igloolik [was similar but then]
@@ -2146,7 +2178,7 @@
# Central Time and Southampton Island [in the Central zone] is not
# required to use daylight savings.
-# From <http://www.nunatsiaq.com/archives/nunavut001130/nvt21110_02.html>
+# From <http://www.nunatsiaqonline.ca/archives/nunavut001130/nvt21110_02.html>
# Nunavut now has two time zones (2000-11-10):
# The Nunavut government would allow its employees in Kugluktuk and
# Cambridge Bay to operate on central time year-round, putting them
@@ -2477,7 +2509,7 @@
# http://gaceta.diputados.gob.mx/Gaceta/61/2009/dic/V2-101209.html
#
# Our page:
-# http://www.timeanddate.com/news/time/north-mexico-dst-change.html
+# https://www.timeanddate.com/news/time/north-mexico-dst-change.html
# From Arthur David Olson (2010-01-20):
# The page
@@ -2896,7 +2928,7 @@
# http://www.nnc.cubaweb.cu/marzo-2008/cien-1-11-3-08.htm
#
# Some more background information is posted here:
-# http://www.timeanddate.com/news/time/cuba-starts-dst-march-16.html
+# https://www.timeanddate.com/news/time/cuba-starts-dst-march-16.html
#
# The article also says that Cuba has been observing DST since 1963,
# while Shanks (and tzdata) has 1965 as the first date (except in the
@@ -2943,7 +2975,7 @@
# http://granma.co.cu/2011/03/08/nacional/artic01.html
#
# Our info:
-# http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html
+# https://www.timeanddate.com/news/time/cuba-starts-dst-2011.html
#
# From Steffen Thorsen (2011-10-30)
# Cuba will end DST two weeks later this year. Instead of going back
@@ -2953,7 +2985,7 @@
# http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html
#
# Our page:
-# http://www.timeanddate.com/news/time/cuba-time-changes-2011.html
+# https://www.timeanddate.com/news/time/cuba-time-changes-2011.html
#
# From Steffen Thorsen (2012-03-01)
# According to Radio Reloj, Cuba will start DST on Midnight between March
@@ -2963,7 +2995,7 @@
# http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril
#
# Our info on it:
-# http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html
+# https://www.timeanddate.com/news/time/cuba-starts-dst-2012.html
# From Steffen Thorsen (2012-11-03):
# Radio Reloj and many other sources report that Cuba is changing back
@@ -3158,8 +3190,8 @@
# From Steffen Thorsen (2016-03-12):
# Jean Antoine, editor of www.haiti-reference.com informed us that Haiti
# are not going on DST this year. Several other resources confirm this: ...
-# http://www.radiotelevisioncaraibes.com/presse/heure_d_t_pas_de_changement_d_heure_pr_vu_pour_cet_ann_e.html
-# http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
+# https://www.radiotelevisioncaraibes.com/presse/heure_d_t_pas_de_changement_d_heure_pr_vu_pour_cet_ann_e.html
+# https://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
# http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/
# From Steffen Thorsen (2017-03-12):
@@ -3358,7 +3390,7 @@
# Turks and Caicos
#
# From Chris Dunn in
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415007
+# https://bugs.debian.org/415007
# (2007-03-15): In the Turks & Caicos Islands (America/Grand_Turk) the
# daylight saving dates for time changes have been adjusted to match
# the recent U.S. change of dates.
@@ -3380,12 +3412,25 @@
# "permanent daylight saving time" by one year....
# http://tcweeklynews.com/time-change-to-go-ahead-this-november-p5437-127.htm
#
+# From the Turks & Caicos Cabinet (2017-07-20), heads-up from Steffen Thorsen:
+# ... agreed to the reintroduction in TCI of Daylight Saving Time (DST)
+# during the summer months and Standard Time, also known as Local
+# Time, during the winter months with effect from April 2018 ...
+# https://www.gov.uk/government/news/turks-and-caicos-post-cabinet-meeting-statement--3
+#
+# From Paul Eggert (2017-08-26):
+# The date of effect of the spring 2018 change appears to be March 11,
+# which makes more sense. See: Hamilton D. Time change back
+# by March 2018 for TCI. Magnetic Media. 2017-08-25.
+# http://magneticmediatv.com/2017/08/time-change-back-by-march-2018-for-tci/
+#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Grand_Turk -4:44:32 - LMT 1890
-5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST 1979
-5:00 US E%sT 2015 Nov Sun>=1 2:00
- -4:00 - AST
+ -4:00 - AST 2018 Mar 11 3:00
+ -5:00 US E%sT
# British Virgin Is
# Virgin Is
--- a/make/data/tzdata/southamerica Mon Nov 13 12:10:49 2017 -0800
+++ b/make/data/tzdata/southamerica Mon Nov 13 13:18:35 2017 -0800
@@ -45,7 +45,7 @@
#
# For data circa 1899, a common source is:
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
+# https://www.jstor.org/stable/1774359
#
# These tables use numeric abbreviations like -03 and -0330 for
# integer hour and minute UTC offsets. Although earlier editions used
@@ -288,8 +288,8 @@
#
# Es inminente que en San Luis atrasen una hora los relojes
# (It is imminent in San Luis clocks one hour delay)
-# http://www.lagaceta.com.ar/nota/253414/Economia/Es-inminente-que-en-San-Luis-atrasen-una-hora-los-relojes.html
-# http://www.worldtimezone.net/dst_news/dst_news_argentina02.html
+# https://www.lagaceta.com.ar/nota/253414/Economia/Es-inminente-que-en-San-Luis-atrasen-una-hora-los-relojes.html
+# http://www.worldtimezone.com/dst_news/dst_news_argentina02.html
# From Jesper Nørgaard Welen (2008-01-18):
# The page of the San Luis provincial government
@@ -408,7 +408,7 @@
# Perhaps San Luis operates on the legal fiction that it is at -04
# with perpetual summer time, but ordinary usage typically seems to
# just say it's at -03; see, for example,
-# http://es.wikipedia.org/wiki/Hora_oficial_argentina
+# https://es.wikipedia.org/wiki/Hora_oficial_argentina
# We've documented similar situations as being plain changes to
# standard time, so let's do that here too. This does not change UTC
# offsets, only tm_isdst and the time zone abbreviations. One minor
@@ -739,7 +739,7 @@
# (Portuguese)
#
# We have a written a short article about it as well:
-# http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html
+# https://www.timeanddate.com/news/time/brazil-dst-2008-2009.html
#
# From Alexander Krivenyshev (2011-10-04):
# State Bahia will return to Daylight savings time this year after 8 years off.
@@ -748,7 +748,7 @@
# In Portuguese:
# http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html
-# http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html
+# https://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html
# From Guilherme Bernardes Rodrigues (2011-10-07):
# There is news in the media, however there is still no decree about it.
@@ -774,16 +774,16 @@
# From Rodrigo Severo (2012-10-16):
# Tocantins state will have DST.
-# http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html
+# https://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html
# From Steffen Thorsen (2013-09-20):
# Tocantins in Brazil is very likely not to observe DST from October....
# http://conexaoto.com.br/2013/09/18/ministerio-confirma-que-tocantins-esta-fora-do-horario-de-verao-em-2013-mas-falta-publicacao-de-decreto
# We will keep this article updated when this is confirmed:
-# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
+# https://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
# From Steffen Thorsen (2013-10-17):
-# http://www.timeanddate.com/news/time/acre-amazonas-change-time-zone.html
+# https://www.timeanddate.com/news/time/acre-amazonas-change-time-zone.html
# Senator Jorge Viana announced that Acre will change time zone on November 10.
# He did not specify the time of the change, nor if western parts of Amazonas
# will change as well.
@@ -1099,18 +1099,18 @@
# the following source, cited by Oscar van Vlijmen (2006-10-08):
# [1] Chile Law
# http://www.webexhibits.org/daylightsaving/chile.html
-# This contains a copy of a this official table:
+# This contains a copy of this official table:
# Cambios en la hora oficial de Chile desde 1900 (retrieved 2008-03-30)
-# http://web.archive.org/web/20080330200901/http://www.horaoficial.cl/cambio.htm
+# https://web.archive.org/web/20080330200901/http://www.horaoficial.cl/cambio.htm
# [1] needs several corrections, though.
#
# The first set of corrections is from:
# [2] History of the Official Time of Chile
# http://www.horaoficial.cl/ing/horaof_ing.html (retrieved 2012-03-06). See:
-# http://web.archive.org/web/20120306042032/http://www.horaoficial.cl/ing/horaof_ing.html
+# https://web.archive.org/web/20120306042032/http://www.horaoficial.cl/ing/horaof_ing.html
# This is an English translation of:
# Historia de la hora oficial de Chile (retrieved 2012-10-24). See:
-# http://web.archive.org/web/20121024234627/http://www.horaoficial.cl/horaof.htm
+# https://web.archive.org/web/20121024234627/http://www.horaoficial.cl/horaof.htm
# A fancier Spanish version (requiring mouse-clicking) is at:
# http://www.horaoficial.cl/historia_hora.html
# Conflicts between [1] and [2] were resolved as follows:
@@ -1386,10 +1386,10 @@
# Milne says the Central and South American Telegraph Company used -5:24:15.
#
# From Alois Treindl (2016-12-15):
-# http://www.elcomercio.com/actualidad/hora-sixto-1993.html
+# https://www.elcomercio.com/actualidad/hora-sixto-1993.html
# ... Whether the law applied also to Galápagos, I do not know.
# From Paul Eggert (2016-12-15):
-# http://www.elcomercio.com/afull/modificacion-husohorario-ecuador-presidentes-decreto.html
+# https://www.elcomercio.com/afull/modificacion-husohorario-ecuador-presidentes-decreto.html
# This says President Sixto Durán Ballén signed decree No. 285, which
# established DST from 1992-11-28 to 1993-02-05; it does not give transition
# times. The people called it "hora de Sixto" ("Sixto hour"). The change did
@@ -1801,7 +1801,7 @@
# hours of presidential broadcasts, hours of lines,' quipped comedian
# Jean Mary Curró ...". See: Cawthorne A, Kai D. Venezuela scraps
# half-hour time difference set by Chavez. Reuters 2016-04-15 14:50 -0400
-# http://www.reuters.com/article/us-venezuela-timezone-idUSKCN0XC2BE
+# https://www.reuters.com/article/us-venezuela-timezone-idUSKCN0XC2BE
#
# From Matt Johnson (2016-04-20):
# ... published in the official Gazette [2016-04-18], here:
--- a/make/data/tzdata/zone.tab Mon Nov 13 12:10:49 2017 -0800
+++ b/make/data/tzdata/zone.tab Mon Nov 13 13:18:35 2017 -0800
@@ -209,7 +209,7 @@
GD +1203-06145 America/Grenada
GE +4143+04449 Asia/Tbilisi
GF +0456-05220 America/Cayenne
-GG +4927-00232 Europe/Guernsey
+GG +492717-0023210 Europe/Guernsey
GH +0533-00013 Africa/Accra
GI +3608-00521 Europe/Gibraltar
GL +6411-05144 America/Godthab Greenland (most areas)
@@ -244,7 +244,7 @@
IR +3540+05126 Asia/Tehran
IS +6409-02151 Atlantic/Reykjavik
IT +4154+01229 Europe/Rome
-JE +4912-00207 Europe/Jersey
+JE +491101-0020624 Europe/Jersey
JM +175805-0764736 America/Jamaica
JO +3157+03556 Asia/Amman
JP +353916+1394441 Asia/Tokyo
--- a/make/lib/Lib-jdk.net.gmk Mon Nov 13 12:10:49 2017 -0800
+++ b/make/lib/Lib-jdk.net.gmk Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
SRC := $(TOPDIR)/src/jdk.net/solaris/native/libextnet, \
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net, \
- MAPFILE := $(TOPDIR)/make/mapfiles/libextnet/mapfile-vers, \
+ MAPFILE := $(TOPDIR)/make/mapfiles/libextnet/mapfile-solaris, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS := -lsocket -lc -ljava, \
@@ -48,4 +48,25 @@
endif
+ifeq ($(OPENJDK_TARGET_OS), linux)
+
+ $(eval $(call SetupNativeCompilation, BUILD_LIBEXTNET, \
+ LIBRARY := extnet, \
+ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ SRC := $(TOPDIR)/src/jdk.net/linux/native/libextnet, \
+ OPTIMIZATION := LOW, \
+ CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net, \
+ MAPFILE := $(TOPDIR)/make/mapfiles/libextnet/mapfile-linux, \
+ LDFLAGS := $(LDFLAGS_JDKLIB) \
+ $(call SET_SHARED_LIBRARY_ORIGIN), \
+ LIBS := -ljvm -ljava -lc, \
+ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libextnet, \
+ ))
+
+ $(BUILD_LIBEXTNET): $(call FindLib, java.base, java)
+
+ TARGETS += $(BUILD_LIBEXTNET)
+endif
+
+
################################################################################
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/mapfiles/libextnet/mapfile-linux Mon Nov 13 13:18:35 2017 -0800
@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+SUNWprivate_1.1 {
+ global:
+ Java_jdk_net_LinuxSocketOptions_setQuickAck0;
+ Java_jdk_net_LinuxSocketOptions_getQuickAck0;
+ Java_jdk_net_LinuxSocketOptions_quickAckSupported0;
+ local:
+ *;
+};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/mapfiles/libextnet/mapfile-solaris Mon Nov 13 13:18:35 2017 -0800
@@ -0,0 +1,34 @@
+#
+# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+SUNWprivate_1.1 {
+ global:
+ Java_jdk_net_SolarisSocketOptions_init;
+ Java_jdk_net_SolarisSocketOptions_setFlowOption;
+ Java_jdk_net_SolarisSocketOptions_getFlowOption;
+ Java_jdk_net_SolarisSocketOptions_flowSupported;
+ local:
+ *;
+};
--- a/make/mapfiles/libextnet/mapfile-vers Mon Nov 13 12:10:49 2017 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-SUNWprivate_1.1 {
- global:
- Java_jdk_net_SolarisSocketOptions_init;
- Java_jdk_net_SolarisSocketOptions_setFlowOption;
- Java_jdk_net_SolarisSocketOptions_getFlowOption;
- Java_jdk_net_SolarisSocketOptions_flowSupported;
- local:
- *;
-};
--- a/src/java.base/share/classes/java/io/ObjectInputFilter.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/java.base/share/classes/java/io/ObjectInputFilter.java Mon Nov 13 13:18:35 2017 -0800
@@ -495,8 +495,8 @@
// Wildcard cases
if (p.endsWith(".*")) {
// Pattern is a package name with a wildcard
- final String pkg = p.substring(poffset, nameLen - 1);
- if (pkg.length() < 2) {
+ final String pkg = p.substring(poffset, nameLen - 2);
+ if (pkg.isEmpty()) {
throw new IllegalArgumentException("package missing in: \"" + pattern + "\"");
}
if (negate) {
@@ -651,13 +651,12 @@
* Returns {@code true} if the class is in the package.
*
* @param c a class
- * @param pkg a package name (including the trailing ".")
+ * @param pkg a package name
* @return {@code true} if the class is in the package,
* otherwise {@code false}
*/
private static boolean matchesPackage(Class<?> c, String pkg) {
- String n = c.getName();
- return n.startsWith(pkg) && n.lastIndexOf('.') == pkg.length() - 1;
+ return pkg.equals(c.getPackageName());
}
/**
--- a/src/java.base/share/classes/java/io/ObjectStreamClass.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/java.base/share/classes/java/io/ObjectStreamClass.java Mon Nov 13 13:18:35 2017 -0800
@@ -1580,18 +1580,7 @@
*/
private static boolean packageEquals(Class<?> cl1, Class<?> cl2) {
return (cl1.getClassLoader() == cl2.getClassLoader() &&
- getPackageName(cl1).equals(getPackageName(cl2)));
- }
-
- /**
- * Returns package name of given class.
- */
- private static String getPackageName(Class<?> cl) {
- String s = cl.getName();
- int i = s.lastIndexOf('[');
- i = (i < 0) ? 0 : i + 2;
- int j = s.lastIndexOf('.');
- return (i < j) ? s.substring(i, j) : "";
+ cl1.getPackageName().equals(cl2.getPackageName()));
}
/**
--- a/src/java.base/share/classes/java/lang/ClassLoader.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/java.base/share/classes/java/lang/ClassLoader.java Mon Nov 13 13:18:35 2017 -0800
@@ -675,12 +675,11 @@
return;
}
- final String name = cls.getName();
- final int i = name.lastIndexOf('.');
- if (i != -1) {
+ final String packageName = cls.getPackageName();
+ if (!packageName.isEmpty()) {
AccessController.doPrivileged(new PrivilegedAction<>() {
public Void run() {
- sm.checkPackageAccess(name.substring(0, i));
+ sm.checkPackageAccess(packageName);
return null;
}
}, new AccessControlContext(new ProtectionDomain[] {pd}));
--- a/src/java.base/share/classes/java/lang/reflect/Proxy.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/java.base/share/classes/java/lang/reflect/Proxy.java Mon Nov 13 13:18:35 2017 -0800
@@ -1034,11 +1034,8 @@
// do permission check if the caller is in a different runtime package
// of the proxy class
- int n = proxyClass.getName().lastIndexOf('.');
- String pkg = (n == -1) ? "" : proxyClass.getName().substring(0, n);
-
- n = caller.getName().lastIndexOf('.');
- String callerPkg = (n == -1) ? "" : caller.getName().substring(0, n);
+ String pkg = proxyClass.getPackageName();
+ String callerPkg = caller.getPackageName();
if (pcl != ccl || !pkg.equals(callerPkg)) {
sm.checkPermission(new ReflectPermission("newProxyInPackage." + pkg));
--- a/src/java.base/share/classes/java/time/format/ZoneName.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/java.base/share/classes/java/time/format/ZoneName.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -192,7 +192,7 @@
"Africa/Ndjamena", "Africa_Western", "Africa/Lagos",
"Asia/Macau", "China", "Asia/Shanghai",
"America/Lima", "Peru", "America/Lima",
- "Africa/Windhoek", "Africa_Western", "Africa/Lagos",
+ "Africa/Windhoek", "Africa_Central", "Africa/Maputo",
"America/Sitka", "Alaska", "America/Juneau",
"America/Mazatlan", "America_Mountain", "America/Denver",
"Asia/Saigon", "Indochina", "Asia/Saigon",
@@ -324,7 +324,7 @@
"Atlantic/Faroe", "Europe_Western", "Atlantic/Canary",
"America/Cambridge_Bay", "America_Mountain", "America/Denver",
"America/Los_Angeles", "America_Pacific", "America/Los_Angeles",
- "Africa/Khartoum", "Africa_Eastern", "Africa/Nairobi",
+ "Africa/Khartoum", "Africa_Central", "Africa/Maputo",
"Europe/Simferopol", "Europe_Eastern", "Europe/Bucharest",
"Australia/Currie", "Australia_Eastern", "Australia/Sydney",
"Europe/Guernsey", "GMT", "Atlantic/Reykjavik",
@@ -744,7 +744,6 @@
"UTC", "Etc/UTC",
"Canada/Newfoundland", "America/St_Johns",
"Europe/Skopje", "Europe/Belgrade",
- "Canada/East-Saskatchewan", "America/Regina",
"PRC", "Asia/Shanghai",
"UCT", "Etc/UCT",
"America/Mendoza", "America/Argentina/Mendoza",
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java Mon Nov 13 13:18:35 2017 -0800
@@ -695,8 +695,9 @@
* stale pointer that is now off the list.
*/
final Node<E> pred(Node<E> p) {
- Node<E> q = p.prev;
- return (p == q) ? last() : q;
+ if (p == (p = p.prev))
+ p = last();
+ return p;
}
/**
@@ -867,31 +868,31 @@
public E peekFirst() {
restart: for (;;) {
- for (Node<E> first = first(), p = first;;) {
- final E item;
- if ((item = p.item) != null) {
- // recheck for linearizability
- if (first.prev != null) continue restart;
- return item;
- }
- if ((p = succ(p)) == null)
- return null;
+ E item;
+ Node<E> first = first(), p = first;
+ while ((item = p.item) == null) {
+ if (p == (p = p.next)) continue restart;
+ if (p == null)
+ break;
}
+ // recheck for linearizability
+ if (first.prev != null) continue restart;
+ return item;
}
}
public E peekLast() {
restart: for (;;) {
- for (Node<E> last = last(), p = last;;) {
- final E item;
- if ((item = p.item) != null) {
- // recheck for linearizability
- if (last.next != null) continue restart;
- return item;
- }
- if ((p = pred(p)) == null)
- return null;
+ E item;
+ Node<E> last = last(), p = last;
+ while ((item = p.item) == null) {
+ if (p == (p = p.prev)) continue restart;
+ if (p == null)
+ break;
}
+ // recheck for linearizability
+ if (last.next != null) continue restart;
+ return item;
}
}
@@ -921,8 +922,11 @@
return item;
}
}
- if ((p = succ(p)) == null)
+ if (p == (p = p.next)) continue restart;
+ if (p == null) {
+ if (first.prev != null) continue restart;
return null;
+ }
}
}
}
@@ -939,8 +943,11 @@
return item;
}
}
- if ((p = pred(p)) == null)
+ if (p == (p = p.prev)) continue restart;
+ if (p == null) {
+ if (last.next != null) continue restart;
return null;
+ }
}
}
}
--- a/src/java.base/share/classes/sun/invoke/util/VerifyAccess.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/java.base/share/classes/sun/invoke/util/VerifyAccess.java Mon Nov 13 13:18:35 2017 -0800
@@ -332,16 +332,6 @@
return Objects.equals(class1.getPackageName(), class2.getPackageName());
}
- /** Return the package name for this class.
- */
- public static String getPackageName(Class<?> cls) {
- assert (!cls.isArray());
- String name = cls.getName();
- int dot = name.lastIndexOf('.');
- if (dot < 0) return "";
- return name.substring(0, dot);
- }
-
/**
* Test if two classes are defined as part of the same package member (top-level class).
* If this is true, they can share private access with each other.
--- a/src/java.base/share/classes/sun/nio/ch/IOUtil.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/java.base/share/classes/sun/nio/ch/IOUtil.java Mon Nov 13 13:18:35 2017 -0800
@@ -297,7 +297,7 @@
NativeDispatcher nd)
throws IOException
{
- return read(fd, bufs, offset, bufs.length, false, -1, nd);
+ return read(fd, bufs, offset, length, false, -1, nd);
}
static long read(FileDescriptor fd, ByteBuffer[] bufs, int offset, int length,
--- a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -349,7 +349,7 @@
{"Africa/Johannesburg", SAST},
{"Africa/Juba", EAT},
{"Africa/Kampala", EAT},
- {"Africa/Khartoum", EAT},
+ {"Africa/Khartoum", CAT},
{"Africa/Kigali", CAT},
{"Africa/Kinshasa", WAT},
{"Africa/Lagos", WAT},
@@ -374,7 +374,7 @@
{"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
+ {"Africa/Windhoek", CAT},
{"America/Adak", HST},
{"America/Anguilla", AST},
{"America/Antigua", AST},
@@ -777,7 +777,6 @@
{"Brazil/West", AMT},
{"Canada/Atlantic", AST},
{"Canada/Central", CST},
- {"Canada/East-Saskatchewan", CST},
{"Canada/Eastern", EST},
{"Canada/Mountain", MST},
{"Canada/Newfoundland", NST},
--- a/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -85,10 +85,18 @@
protected Set<SocketOption<?>> supportedOptions() {
HashSet<SocketOption<?>> options = new HashSet<>(super.supportedOptions());
- options.addAll(extendedOptions.options());
+ addExtSocketOptions(extendedOptions.options(), options);
return options;
}
+ private void addExtSocketOptions(Set<SocketOption<?>> extOptions,
+ Set<SocketOption<?>> options) {
+ // TCP_QUICKACK is applicable for TCP Sockets only.
+ extOptions.stream()
+ .filter((option) -> !option.name().equals("TCP_QUICKACK"))
+ .forEach((option) -> options.add(option));
+ }
+
protected void socketSetOption(int opt, Object val) throws SocketException {
if (opt == SocketOptions.SO_REUSEPORT &&
!supportedOptions().contains(StandardSocketOptions.SO_REUSEPORT)) {
--- a/src/java.logging/share/classes/java/util/logging/FileHandler.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/java.logging/share/classes/java/util/logging/FileHandler.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -616,79 +616,96 @@
* @throws IOException
*/
private File generate(String pattern, int generation, int unique)
- throws IOException {
- File file = null;
- String word = "";
- int ix = 0;
+ throws IOException
+ {
+ return generate(pattern, count, generation, unique);
+ }
+
+ // The static method here is provided for whitebox testing of the algorithm.
+ static File generate(String pat, int count, int generation, int unique)
+ throws IOException
+ {
+ Path path = Paths.get(pat);
+ Path result = null;
boolean sawg = false;
boolean sawu = false;
- while (ix < pattern.length()) {
- char ch = pattern.charAt(ix);
- ix++;
- char ch2 = 0;
- if (ix < pattern.length()) {
- ch2 = Character.toLowerCase(pattern.charAt(ix));
+ StringBuilder word = new StringBuilder();
+ Path prev = null;
+ for (Path elem : path) {
+ if (prev != null) {
+ prev = prev.resolveSibling(word.toString());
+ result = result == null ? prev : result.resolve(prev);
}
- if (ch == '/') {
- if (file == null) {
- file = new File(word);
- } else {
- file = new File(file, word);
+ String pattern = elem.toString();
+ int ix = 0;
+ word.setLength(0);
+ while (ix < pattern.length()) {
+ char ch = pattern.charAt(ix);
+ ix++;
+ char ch2 = 0;
+ if (ix < pattern.length()) {
+ ch2 = Character.toLowerCase(pattern.charAt(ix));
}
- word = "";
- continue;
- } else if (ch == '%') {
- if (ch2 == 't') {
- String tmpDir = System.getProperty("java.io.tmpdir");
- if (tmpDir == null) {
- tmpDir = System.getProperty("user.home");
+ if (ch == '%') {
+ if (ch2 == 't') {
+ String tmpDir = System.getProperty("java.io.tmpdir");
+ if (tmpDir == null) {
+ tmpDir = System.getProperty("user.home");
+ }
+ result = Paths.get(tmpDir);
+ ix++;
+ word.setLength(0);
+ continue;
+ } else if (ch2 == 'h') {
+ result = Paths.get(System.getProperty("user.home"));
+ if (jdk.internal.misc.VM.isSetUID()) {
+ // Ok, we are in a set UID program. For safety's sake
+ // we disallow attempts to open files relative to %h.
+ throw new IOException("can't use %h in set UID program");
+ }
+ ix++;
+ word.setLength(0);
+ continue;
+ } else if (ch2 == 'g') {
+ word = word.append(generation);
+ sawg = true;
+ ix++;
+ continue;
+ } else if (ch2 == 'u') {
+ word = word.append(unique);
+ sawu = true;
+ ix++;
+ continue;
+ } else if (ch2 == '%') {
+ word = word.append('%');
+ ix++;
+ continue;
}
- file = new File(tmpDir);
- ix++;
- word = "";
- continue;
- } else if (ch2 == 'h') {
- file = new File(System.getProperty("user.home"));
- if (jdk.internal.misc.VM.isSetUID()) {
- // Ok, we are in a set UID program. For safety's sake
- // we disallow attempts to open files relative to %h.
- throw new IOException("can't use %h in set UID program");
- }
- ix++;
- word = "";
- continue;
- } else if (ch2 == 'g') {
- word = word + generation;
- sawg = true;
- ix++;
- continue;
- } else if (ch2 == 'u') {
- word = word + unique;
- sawu = true;
- ix++;
- continue;
- } else if (ch2 == '%') {
- word = word + "%";
- ix++;
- continue;
}
+ word = word.append(ch);
}
- word = word + ch;
+ prev = elem;
}
+
if (count > 1 && !sawg) {
- word = word + "." + generation;
+ word = word.append('.').append(generation);
}
if (unique > 0 && !sawu) {
- word = word + "." + unique;
+ word = word.append('.').append(unique);
}
if (word.length() > 0) {
- if (file == null) {
- file = new File(word);
- } else {
- file = new File(file, word);
- }
+ String n = word.toString();
+ Path p = prev == null ? Paths.get(n) : prev.resolveSibling(n);
+ result = result == null ? p : result.resolve(p);
+ } else if (result == null) {
+ result = Paths.get("");
}
- return file;
+
+ if (path.getRoot() == null) {
+ return result.toFile();
+ } else {
+ return path.getRoot().resolve(result).toFile();
+ }
}
/**
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_de.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -350,7 +350,7 @@
{"Africa/Johannesburg", SAST},
{"Africa/Juba", EAT},
{"Africa/Kampala", EAT},
- {"Africa/Khartoum", EAT},
+ {"Africa/Khartoum", CAT},
{"Africa/Kigali", CAT},
{"Africa/Kinshasa", WAT},
{"Africa/Lagos", WAT},
@@ -375,7 +375,7 @@
{"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
+ {"Africa/Windhoek", CAT},
{"America/Adak", HST},
{"America/Anguilla", AST},
{"America/Antigua", AST},
@@ -778,7 +778,6 @@
{"Brazil/West", AMT},
{"Canada/Atlantic", AST},
{"Canada/Central", CST},
- {"Canada/East-Saskatchewan", CST},
{"Canada/Eastern", EST},
{"Canada/Mountain", MST},
{"Canada/Newfoundland", NST},
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_es.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -350,7 +350,7 @@
{"Africa/Johannesburg", SAST},
{"Africa/Juba", EAT},
{"Africa/Kampala", EAT},
- {"Africa/Khartoum", EAT},
+ {"Africa/Khartoum", CAT},
{"Africa/Kigali", CAT},
{"Africa/Kinshasa", WAT},
{"Africa/Lagos", WAT},
@@ -375,7 +375,7 @@
{"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
+ {"Africa/Windhoek", CAT},
{"America/Adak", HST},
{"America/Anguilla", AST},
{"America/Antigua", AST},
@@ -778,7 +778,6 @@
{"Brazil/West", AMT},
{"Canada/Atlantic", AST},
{"Canada/Central", CST},
- {"Canada/East-Saskatchewan", CST},
{"Canada/Eastern", EST},
{"Canada/Mountain", MST},
{"Canada/Newfoundland", NST},
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_fr.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -350,7 +350,7 @@
{"Africa/Johannesburg", SAST},
{"Africa/Juba", EAT},
{"Africa/Kampala", EAT},
- {"Africa/Khartoum", EAT},
+ {"Africa/Khartoum", CAT},
{"Africa/Kigali", CAT},
{"Africa/Kinshasa", WAT},
{"Africa/Lagos", WAT},
@@ -375,7 +375,7 @@
{"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
+ {"Africa/Windhoek", CAT},
{"America/Adak", HST},
{"America/Anguilla", AST},
{"America/Antigua", AST},
@@ -778,7 +778,6 @@
{"Brazil/West", AMT},
{"Canada/Atlantic", AST},
{"Canada/Central", CST},
- {"Canada/East-Saskatchewan", CST},
{"Canada/Eastern", EST},
{"Canada/Mountain", MST},
{"Canada/Newfoundland", NST},
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_it.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -350,7 +350,7 @@
{"Africa/Johannesburg", SAST},
{"Africa/Juba", EAT},
{"Africa/Kampala", EAT},
- {"Africa/Khartoum", EAT},
+ {"Africa/Khartoum", CAT},
{"Africa/Kigali", CAT},
{"Africa/Kinshasa", WAT},
{"Africa/Lagos", WAT},
@@ -375,7 +375,7 @@
{"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
+ {"Africa/Windhoek", CAT},
{"America/Adak", HST},
{"America/Anguilla", AST},
{"America/Antigua", AST},
@@ -778,7 +778,6 @@
{"Brazil/West", AMT},
{"Canada/Atlantic", AST},
{"Canada/Central", CST},
- {"Canada/East-Saskatchewan", CST},
{"Canada/Eastern", EST},
{"Canada/Mountain", MST},
{"Canada/Newfoundland", NST},
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ja.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -350,7 +350,7 @@
{"Africa/Johannesburg", SAST},
{"Africa/Juba", EAT},
{"Africa/Kampala", EAT},
- {"Africa/Khartoum", EAT},
+ {"Africa/Khartoum", CAT},
{"Africa/Kigali", CAT},
{"Africa/Kinshasa", WAT},
{"Africa/Lagos", WAT},
@@ -375,7 +375,7 @@
{"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
+ {"Africa/Windhoek", CAT},
{"America/Adak", HST},
{"America/Anguilla", AST},
{"America/Antigua", AST},
@@ -778,7 +778,6 @@
{"Brazil/West", AMT},
{"Canada/Atlantic", AST},
{"Canada/Central", CST},
- {"Canada/East-Saskatchewan", CST},
{"Canada/Eastern", EST},
{"Canada/Mountain", MST},
{"Canada/Newfoundland", NST},
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_ko.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -350,7 +350,7 @@
{"Africa/Johannesburg", SAST},
{"Africa/Juba", EAT},
{"Africa/Kampala", EAT},
- {"Africa/Khartoum", EAT},
+ {"Africa/Khartoum", CAT},
{"Africa/Kigali", CAT},
{"Africa/Kinshasa", WAT},
{"Africa/Lagos", WAT},
@@ -375,7 +375,7 @@
{"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
+ {"Africa/Windhoek", CAT},
{"America/Adak", HST},
{"America/Anguilla", AST},
{"America/Antigua", AST},
@@ -778,7 +778,6 @@
{"Brazil/West", AMT},
{"Canada/Atlantic", AST},
{"Canada/Central", CST},
- {"Canada/East-Saskatchewan", CST},
{"Canada/Eastern", EST},
{"Canada/Mountain", MST},
{"Canada/Newfoundland", NST},
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_pt_BR.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -350,7 +350,7 @@
{"Africa/Johannesburg", SAST},
{"Africa/Juba", EAT},
{"Africa/Kampala", EAT},
- {"Africa/Khartoum", EAT},
+ {"Africa/Khartoum", CAT},
{"Africa/Kigali", CAT},
{"Africa/Kinshasa", WAT},
{"Africa/Lagos", WAT},
@@ -375,7 +375,7 @@
{"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
+ {"Africa/Windhoek", CAT},
{"America/Adak", HST},
{"America/Anguilla", AST},
{"America/Antigua", AST},
@@ -778,7 +778,6 @@
{"Brazil/West", AMT},
{"Canada/Atlantic", AST},
{"Canada/Central", CST},
- {"Canada/East-Saskatchewan", CST},
{"Canada/Eastern", EST},
{"Canada/Mountain", MST},
{"Canada/Newfoundland", NST},
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_sv.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -350,7 +350,7 @@
{"Africa/Johannesburg", SAST},
{"Africa/Juba", EAT},
{"Africa/Kampala", EAT},
- {"Africa/Khartoum", EAT},
+ {"Africa/Khartoum", CAT},
{"Africa/Kigali", CAT},
{"Africa/Kinshasa", WAT},
{"Africa/Lagos", WAT},
@@ -375,7 +375,7 @@
{"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
+ {"Africa/Windhoek", CAT},
{"America/Adak", HST},
{"America/Anguilla", AST},
{"America/Antigua", AST},
@@ -778,7 +778,6 @@
{"Brazil/West", AMT},
{"Canada/Atlantic", AST},
{"Canada/Central", CST},
- {"Canada/East-Saskatchewan", CST},
{"Canada/Eastern", EST},
{"Canada/Mountain", MST},
{"Canada/Newfoundland", NST},
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_CN.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -350,7 +350,7 @@
{"Africa/Johannesburg", SAST},
{"Africa/Juba", EAT},
{"Africa/Kampala", EAT},
- {"Africa/Khartoum", EAT},
+ {"Africa/Khartoum", CAT},
{"Africa/Kigali", CAT},
{"Africa/Kinshasa", WAT},
{"Africa/Lagos", WAT},
@@ -375,7 +375,7 @@
{"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
+ {"Africa/Windhoek", CAT},
{"America/Adak", HST},
{"America/Anguilla", AST},
{"America/Antigua", AST},
@@ -778,7 +778,6 @@
{"Brazil/West", AMT},
{"Canada/Atlantic", AST},
{"Canada/Central", CST},
- {"Canada/East-Saskatchewan", CST},
{"Canada/Eastern", EST},
{"Canada/Mountain", MST},
{"Canada/Newfoundland", NST},
--- a/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/TimeZoneNames_zh_TW.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -350,7 +350,7 @@
{"Africa/Johannesburg", SAST},
{"Africa/Juba", EAT},
{"Africa/Kampala", EAT},
- {"Africa/Khartoum", EAT},
+ {"Africa/Khartoum", CAT},
{"Africa/Kigali", CAT},
{"Africa/Kinshasa", WAT},
{"Africa/Lagos", WAT},
@@ -375,7 +375,7 @@
{"Africa/Timbuktu", GMT},
{"Africa/Tripoli", EET},
{"Africa/Tunis", CET},
- {"Africa/Windhoek", WAT},
+ {"Africa/Windhoek", CAT},
{"America/Adak", HST},
{"America/Anguilla", AST},
{"America/Antigua", AST},
@@ -780,7 +780,6 @@
{"Brazil/West", AMT},
{"Canada/Atlantic", AST},
{"Canada/Central", CST},
- {"Canada/East-Saskatchewan", CST},
{"Canada/Eastern", EST},
{"Canada/Mountain", MST},
{"Canada/Newfoundland", NST},
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.net/linux/classes/jdk/net/LinuxSocketOptions.java Mon Nov 13 13:18:35 2017 -0800
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.net;
+
+import java.net.SocketException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import jdk.net.ExtendedSocketOptions.PlatformSocketOptions;
+
+class LinuxSocketOptions extends PlatformSocketOptions {
+
+ public LinuxSocketOptions() {
+ }
+
+ @Override
+ void setQuickAck(int fd, boolean on) throws SocketException {
+ setQuickAck0(fd, on);
+ }
+
+ @Override
+ boolean getQuickAck(int fd) throws SocketException {
+ return getQuickAck0(fd);
+ }
+
+ @Override
+ public boolean quickAckSupported() {
+ return quickAckSupported0();
+ }
+
+ native static private void setQuickAck0(int fd, boolean on) throws SocketException;
+
+ native static private boolean getQuickAck0(int fd) throws SocketException;
+
+ native static private boolean quickAckSupported0();
+
+ static {
+ AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+ System.loadLibrary("extnet");
+ return null;
+ });
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.net/linux/native/libextnet/LinuxSocketOptions.c Mon Nov 13 13:18:35 2017 -0800
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+#include <sys/socket.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <jni.h>
+#include <netinet/tcp.h>
+#include "jni_util.h"
+
+/*
+ * Class: jdk_net_LinuxSocketOptions
+ * Method: setQuickAck
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL Java_jdk_net_LinuxSocketOptions_setQuickAck0
+(JNIEnv *env, jobject unused, jint fd, jboolean on) {
+ int optval;
+ int rv;
+ optval = (on ? 1 : 0);
+ rv = setsockopt(fd, SOL_SOCKET, TCP_QUICKACK, &optval, sizeof (optval));
+ if (rv < 0) {
+ if (errno == ENOPROTOOPT) {
+ JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
+ "unsupported socket option");
+ } else {
+ JNU_ThrowByNameWithLastError(env, "java/net/SocketException",
+ "set option TCP_QUICKACK failed");
+ }
+ }
+}
+
+/*
+ * Class: jdk_net_LinuxSocketOptions
+ * Method: getQuickAck
+ * Signature: (I)Z;
+ */
+JNIEXPORT jboolean JNICALL Java_jdk_net_LinuxSocketOptions_getQuickAck0
+(JNIEnv *env, jobject unused, jint fd) {
+ int on;
+ socklen_t sz = sizeof (on);
+ int rv = getsockopt(fd, SOL_SOCKET, TCP_QUICKACK, &on, &sz);
+ if (rv < 0) {
+ if (errno == ENOPROTOOPT) {
+ JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
+ "unsupported socket option");
+ } else {
+ JNU_ThrowByNameWithLastError(env, "java/net/SocketException",
+ "get option TCP_QUICKACK failed");
+ }
+ }
+ return on != 0;
+}
+
+/*
+ * Class: jdk_net_LinuxSocketOptions
+ * Method: quickAckSupported
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_jdk_net_LinuxSocketOptions_quickAckSupported0
+(JNIEnv *env, jobject unused) {
+ int one = 1;
+ int rv, s;
+ s = socket(PF_INET, SOCK_STREAM, 0);
+ if (s < 0) {
+ return JNI_FALSE;
+ }
+ rv = setsockopt(s, SOL_SOCKET, TCP_QUICKACK, (void *) &one, sizeof (one));
+ if (rv != 0 && errno == ENOPROTOOPT) {
+ rv = JNI_FALSE;
+ } else {
+ rv = JNI_TRUE;
+ }
+ close(s);
+ return rv;
+}
--- a/src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -67,20 +67,53 @@
public static final SocketOption<SocketFlow> SO_FLOW_SLA = new
ExtSocketOption<SocketFlow>("SO_FLOW_SLA", SocketFlow.class);
+ /**
+ * Disable Delayed Acknowledgements.
+ *
+ * <p>
+ * This socket option can be used to reduce or disable delayed
+ * acknowledgments (ACKs). When {@code TCP_QUICKACK} is enabled, ACKs are
+ * sent immediately, rather than delayed if needed in accordance to normal
+ * TCP operation. This option is not permanent, it only enables a switch to
+ * or from {@code TCP_QUICKACK} mode. Subsequent operations of the TCP
+ * protocol will once again disable/enable {@code TCP_QUICKACK} mode
+ * depending on internal protocol processing and factors such as delayed ACK
+ * timeouts occurring and data transfer, therefore this option needs to be
+ * set with {@code setOption} after each operation of TCP on a given socket.
+ *
+ * <p>
+ * The value of this socket option is a {@code Boolean} that represents
+ * whether the option is enabled or disabled. The socket option is specific
+ * to stream-oriented sockets using the TCP/IP protocol. The exact semantics
+ * of this socket option are socket type and system dependent.
+ *
+ * @since 10
+ */
+ public static final SocketOption<Boolean> TCP_QUICKACK =
+ new ExtSocketOption<Boolean>("TCP_QUICKACK", Boolean.class);
private static final PlatformSocketOptions platformSocketOptions =
PlatformSocketOptions.get();
private static final boolean flowSupported =
platformSocketOptions.flowSupported();
+ private static final boolean quickAckSupported =
+ platformSocketOptions.quickAckSupported();
private static final Set<SocketOption<?>> extendedOptions = options();
static Set<SocketOption<?>> options() {
- if (flowSupported)
- return Set.of(SO_FLOW_SLA);
- else
+ if (flowSupported) {
+ if (quickAckSupported) {
+ return Set.of(SO_FLOW_SLA, TCP_QUICKACK);
+ } else {
+ return Set.of(SO_FLOW_SLA);
+ }
+ } else if (quickAckSupported) {
+ return Set.of(TCP_QUICKACK);
+ } else {
return Collections.<SocketOption<?>>emptySet();
+ }
}
static {
@@ -105,6 +138,8 @@
assert flowSupported;
SocketFlow flow = checkValueType(value, option.type());
setFlowOption(fd, flow);
+ } else if (option == TCP_QUICKACK) {
+ setQuickAckOption(fd, (boolean) value);
} else {
throw new InternalError("Unexpected option " + option);
}
@@ -127,6 +162,8 @@
SocketFlow flow = SocketFlow.create();
getFlowOption(fd, flow);
return flow;
+ } else if (option == TCP_QUICKACK) {
+ return getQuickAckOption(fd);
} else {
throw new InternalError("Unexpected option " + option);
}
@@ -156,12 +193,21 @@
}
private static void getFlowOption(FileDescriptor fd, SocketFlow f)
- throws SocketException
- {
+ throws SocketException {
int status = platformSocketOptions.getFlowOption(fdAccess.get(fd), f);
f.status(status); // augment the given flow with the status
}
+ private static void setQuickAckOption(FileDescriptor fd, boolean enable)
+ throws SocketException {
+ platformSocketOptions.setQuickAck(fdAccess.get(fd), enable);
+ }
+
+ private static Object getQuickAckOption(FileDescriptor fd)
+ throws SocketException {
+ return platformSocketOptions.getQuickAck(fdAccess.get(fd));
+ }
+
static class PlatformSocketOptions {
protected PlatformSocketOptions() {}
@@ -184,9 +230,13 @@
return System.getProperty("os.name");
}
});
- if ("SunOS".equals(osname))
+ if ("SunOS".equals(osname)) {
return newInstance("jdk.net.SolarisSocketOptions");
- return new PlatformSocketOptions();
+ } else if ("Linux".equals(osname)) {
+ return newInstance("jdk.net.LinuxSocketOptions");
+ } else {
+ return new PlatformSocketOptions();
+ }
}
private static final PlatformSocketOptions instance = create();
@@ -208,5 +258,17 @@
boolean flowSupported() {
return false;
}
+
+ void setQuickAck(int fd, boolean on) throws SocketException {
+ throw new UnsupportedOperationException("unsupported TCP_QUICKACK option");
+ }
+
+ boolean getQuickAck(int fd) throws SocketException {
+ throw new UnsupportedOperationException("unsupported TCP_QUICKACK option");
+ }
+
+ boolean quickAckSupported() {
+ return false;
+ }
}
}
--- a/src/jdk.net/share/classes/jdk/net/Sockets.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.net/share/classes/jdk/net/Sockets.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -279,6 +279,9 @@
if (flowsupported) {
set.add(ExtendedSocketOptions.SO_FLOW_SLA);
}
+ if (QuickAck.available) {
+ set.add(ExtendedSocketOptions.TCP_QUICKACK);
+ }
set = Collections.unmodifiableSet(set);
options.put(Socket.class, set);
@@ -290,6 +293,9 @@
if (reuseportsupported) {
set.add(StandardSocketOptions.SO_REUSEPORT);
}
+ if (QuickAck.available) {
+ set.add(ExtendedSocketOptions.TCP_QUICKACK);
+ }
set.add(StandardSocketOptions.IP_TOS);
set = Collections.unmodifiableSet(set);
options.put(ServerSocket.class, set);
@@ -331,4 +337,17 @@
return Collections.unmodifiableMap(options);
}
+
+ /**
+ * Tells whether TCP_QUICKACK is supported.
+ */
+ static class QuickAck {
+
+ static final boolean available;
+
+ static {
+ Set<SocketOption<?>> s = new Socket().supportedOptions();
+ available = s.contains(ExtendedSocketOptions.TCP_QUICKACK);
+ }
+ }
}
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/IntType.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/types/IntType.java Mon Nov 13 13:18:35 2017 -0800
@@ -138,7 +138,7 @@
} else if (to.isLong()) {
method.visitInsn(I2L);
} else if (to.isBoolean()) {
- //nop
+ invokestatic(method, JSType.TO_BOOLEAN_I);
} else if (to.isString()) {
invokestatic(method, TO_STRING);
} else if (to.isObject()) {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java Mon Nov 13 12:10:49 2017 -0800
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/JSType.java Mon Nov 13 13:18:35 2017 -0800
@@ -89,6 +89,9 @@
/** JavaScript compliant conversion function from number to boolean */
public static final Call TO_BOOLEAN_D = staticCall(JSTYPE_LOOKUP, JSType.class, "toBoolean", boolean.class, double.class);
+ /** JavaScript compliant conversion function from int to boolean */
+ public static final Call TO_BOOLEAN_I = staticCall(JSTYPE_LOOKUP, JSType.class, "toBoolean", boolean.class, int.class);
+
/** JavaScript compliant conversion function from Object to integer */
public static final Call TO_INTEGER = staticCall(JSTYPE_LOOKUP, JSType.class, "toInteger", int.class, Object.class);
@@ -548,6 +551,17 @@
}
/**
+ * JavaScript compliant conversion of int to boolean
+ *
+ * @param num an int
+ *
+ * @return a boolean
+ */
+ public static boolean toBoolean(final int num) {
+ return num != 0;
+ }
+
+ /**
* JavaScript compliant conversion of Object to boolean
* See ECMA 9.2 ToBoolean
*
--- a/test/jdk/java/nio/channels/SocketChannel/VectorIO.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/nio/channels/SocketChannel/VectorIO.java Mon Nov 13 13:18:35 2017 -0800
@@ -22,6 +22,7 @@
*/
/* @test
+ * @bug 8191025
* @summary Test socketchannel vector IO (use -Dseed=X to set PRNG seed)
* @library .. /test/lib
* @build jdk.test.lib.RandomFactory
@@ -42,11 +43,16 @@
static int testSize;
+ // whether to use the write/read variant with a length parameter
+ static boolean setLength;
+
public static void main(String[] args) throws Exception {
testSize = 1;
+ setLength = false;
runTest();
for(int i=15; i<18; i++) {
testSize = i;
+ setLength = !setLength;
runTest();
}
}
@@ -75,6 +81,9 @@
total += bufs[i].remaining();
}
+ ByteBuffer[] bufsPlus1 = new ByteBuffer[bufs.length + 1];
+ System.arraycopy(bufs, 0, bufsPlus1, 0, bufs.length);
+
// Get a connection to the server
InetAddress lh = InetAddress.getLocalHost();
InetSocketAddress isa = new InetSocketAddress(lh, port);
@@ -85,7 +94,12 @@
// Write the data out
long rem = total;
while (rem > 0L) {
- long bytesWritten = sc.write(bufs);
+ long bytesWritten;
+ if (setLength) {
+ bytesWritten = sc.write(bufsPlus1, 0, bufs.length);
+ } else {
+ bytesWritten = sc.write(bufs);
+ }
if (bytesWritten == 0) {
if (sc.isBlocking()) {
throw new RuntimeException("write did not block");
@@ -134,6 +148,9 @@
total += bufs[i].capacity();
}
+ ByteBuffer[] bufsPlus1 = new ByteBuffer[bufs.length + 1];
+ System.arraycopy(bufs, 0, bufsPlus1, 0, bufs.length);
+
// Get a connection from client
SocketChannel sc = null;
@@ -155,7 +172,12 @@
// Read data into multiple buffers
long avail = total;
while (avail > 0) {
- long bytesRead = sc.read(bufs);
+ long bytesRead;
+ if (setLength) {
+ bytesRead = sc.read(bufsPlus1, 0, bufs.length);
+ } else {
+ bytesRead = sc.read(bufs);
+ }
if (bytesRead < 0)
break;
if (bytesRead == 0) {
--- a/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java Mon Nov 13 13:18:35 2017 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -941,21 +941,21 @@
}
public void test_Apia_jumpForwardOverInternationalDateLine_P12_to_M12() {
- // transition occurred at 1879-07-04T00:00+12:33:04
+ // transition occurred at 1892-07-04T00:00+12:33:04
ZoneRules test = pacificApia();
- Instant instantBefore = LocalDate.of(1879, 7, 2).atStartOfDay(ZoneOffset.UTC).toInstant();
+ Instant instantBefore = LocalDate.of(1892, 7, 2).atStartOfDay(ZoneOffset.UTC).toInstant();
ZoneOffsetTransition trans = test.nextTransition(instantBefore);
- assertEquals(trans.getDateTimeBefore(), LocalDateTime.of(1879, 7, 5, 0, 0));
- assertEquals(trans.getDateTimeAfter(), LocalDateTime.of(1879, 7, 4, 0, 0));
+ assertEquals(trans.getDateTimeBefore(), LocalDateTime.of(1892, 7, 5, 0, 0));
+ assertEquals(trans.getDateTimeAfter(), LocalDateTime.of(1892, 7, 4, 0, 0));
assertEquals(trans.isGap(), false);
assertEquals(trans.isOverlap(), true);
assertEquals(trans.isValidOffset(ZoneOffset.ofHoursMinutesSeconds(+12, 33, 4)), true);
assertEquals(trans.isValidOffset(ZoneOffset.ofHoursMinutesSeconds(-11, -26, -56)), true);
assertEquals(trans.getDuration(), Duration.ofHours(-24));
- assertEquals(trans.getInstant(), LocalDateTime.of(1879, 7, 4, 0, 0).toInstant(ZoneOffset.ofHoursMinutesSeconds(-11, -26, -56)));
+ assertEquals(trans.getInstant(), LocalDateTime.of(1892, 7, 4, 0, 0).toInstant(ZoneOffset.ofHoursMinutesSeconds(-11, -26, -56)));
- ZonedDateTime zdt = ZonedDateTime.of(1879, 7, 4, 23, 0, 0, 0, ZoneId.of("Pacific/Apia"));
- assertEquals(zdt.plusHours(2).toLocalDateTime(), LocalDateTime.of(1879, 7, 4, 1, 0, 0));
+ ZonedDateTime zdt = ZonedDateTime.of(1892, 7, 4, 23, 0, 0, 0, ZoneId.of("Pacific/Apia"));
+ assertEquals(zdt.plusHours(2).toLocalDateTime(), LocalDateTime.of(1892, 7, 4, 1, 0, 0));
}
//-------------------------------------------------------------------------
--- a/test/jdk/java/time/test/java/time/format/ZoneName.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/time/test/java/time/format/ZoneName.java Mon Nov 13 13:18:35 2017 -0800
@@ -104,7 +104,7 @@
"Pacific/Chuuk", "Truk", "Pacific/Truk",
"Africa/Gaborone", "Africa_Central", "Africa/Maputo",
"Africa/Tunis", "Europe_Central", "Europe/Paris",
- "Africa/Khartoum", "Africa_Eastern", "Africa/Nairobi",
+ "Africa/Khartoum", "Africa_Central", "Africa/Maputo",
"Europe/Isle_of_Man", "GMT", "Atlantic/Reykjavik",
"Europe/Skopje", "Europe_Central", "Europe/Paris",
"America/Merida", "America_Central", "America/Chicago",
@@ -221,7 +221,7 @@
"Africa/Algiers", "Europe_Central", "Europe/Paris",
"America/Miquelon", "Pierre_Miquelon", "America/Miquelon",
"Asia/Tokyo", "Japan", "Asia/Tokyo",
- "Africa/Windhoek", "Africa_Western", "Africa/Lagos",
+ "Africa/Windhoek", "Africa_Central", "Africa/Maputo",
"Africa/Bujumbura", "Africa_Central", "Africa/Maputo",
"America/Guatemala", "America_Central", "America/Chicago",
"Africa/Dakar", "GMT", "Atlantic/Reykjavik",
@@ -662,7 +662,6 @@
"America/Rosario", "America/Argentina/Cordoba",
"Jamaica", "America/Jamaica",
"Asia/Katmandu", "Asia/Kathmandu",
- "Canada/East-Saskatchewan", "America/Regina",
"ROK", "Asia/Seoul",
"Asia/Macao", "Asia/Macau",
"Australia/South", "Australia/Adelaide",
--- a/test/jdk/java/util/AbstractList/FailFastIterator.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/AbstractList/FailFastIterator.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4189896
* @summary AbstractList iterators previously checked for co-modification
--- a/test/jdk/java/util/AbstractSequentialList/AddAll.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/AbstractSequentialList/AddAll.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4295163
* @summary AddAll(int, Collection) intersperses the Collection with this List.
--- a/test/jdk/java/util/Collection/IteratorMicroBenchmark.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collection/IteratorMicroBenchmark.java Mon Nov 13 13:18:35 2017 -0800
@@ -233,7 +233,7 @@
}
// Checks for correctness *and* prevents loop optimizations
- class Check {
+ static class Check {
private int sum;
public void sum(int sum) {
if (this.sum == 0)
--- a/test/jdk/java/util/Collection/MOAT.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collection/MOAT.java Mon Nov 13 13:18:35 2017 -0800
@@ -1584,11 +1584,11 @@
}
interface Fun {void f() throws Throwable;}
private static void THROWS(Class<? extends Throwable> k, Fun... fs) {
- for (Fun f : fs)
- try { f.f(); fail("Expected " + k.getName() + " not thrown"); }
- catch (Throwable t) {
- if (k.isAssignableFrom(t.getClass())) pass();
- else unexpected(t);}}
+ for (Fun f : fs)
+ try { f.f(); fail("Expected " + k.getName() + " not thrown"); }
+ catch (Throwable t) {
+ if (k.isAssignableFrom(t.getClass())) pass();
+ else unexpected(t);}}
static byte[] serializedForm(Object obj) {
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
--- a/test/jdk/java/util/Collection/RemoveMicroBenchmark.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collection/RemoveMicroBenchmark.java Mon Nov 13 13:18:35 2017 -0800
@@ -230,7 +230,7 @@
}
// Checks for correctness *and* prevents loop optimizations
- class Check {
+ static class Check {
private int sum;
public void sum(int sum) {
if (this.sum == 0)
--- a/test/jdk/java/util/Collections/AddAll.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/AddAll.java Mon Nov 13 13:18:35 2017 -0800
@@ -33,7 +33,7 @@
public class AddAll {
static final int N = 100;
- public static void main(String args[]) {
+ public static void main(String[] args) {
test(new ArrayList<Integer>());
test(new LinkedList<Integer>());
test(new HashSet<Integer>());
--- a/test/jdk/java/util/Collections/BinarySearchNullComparator.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/BinarySearchNullComparator.java Mon Nov 13 13:18:35 2017 -0800
@@ -30,7 +30,7 @@
import java.util.*;
public class BinarySearchNullComparator {
- public static void main(String args[]) throws Exception {
+ public static void main(String[] args) throws Exception {
List list = Arrays.asList(new String[] {"I", "Love", "You"});
int result = Collections.binarySearch(list, "You", null);
--- a/test/jdk/java/util/Collections/CheckedListBash.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/CheckedListBash.java Mon Nov 13 13:18:35 2017 -0800
@@ -209,15 +209,14 @@
}
static void AddRandoms(List s, int n) {
- for (int i=0; i<n; i++) {
- int r = rnd.nextInt() % n;
- Integer e = new Integer(r < 0 ? -r : r);
+ for (int i = 0; i < n; i++) {
+ Integer e = rnd.nextInt(n);
int preSize = s.size();
if (!s.add(e))
fail("Add failed.");
int postSize = s.size();
- if (postSize-preSize != 1)
+ if (postSize - preSize != 1)
fail("Add didn't increase size by 1.");
}
}
--- a/test/jdk/java/util/Collections/CheckedMapBash.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/CheckedMapBash.java Mon Nov 13 13:18:35 2017 -0800
@@ -36,7 +36,6 @@
import org.testng.annotations.DataProvider;
import static org.testng.Assert.fail;
-import static org.testng.Assert.assertTrue;
public class CheckedMapBash {
static final Random rnd = new Random();
--- a/test/jdk/java/util/Collections/CheckedSetBash.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/CheckedSetBash.java Mon Nov 13 13:18:35 2017 -0800
@@ -122,9 +122,8 @@
}
static void AddRandoms(Set s, int n) {
- for (int i=0; i<n; i++) {
- int r = rnd.nextInt() % n;
- Integer e = new Integer(r < 0 ? -r : r);
+ for (int i = 0; i < n; i++) {
+ Integer e = rnd.nextInt(n);
int preSize = s.size();
boolean prePresent = s.contains(e);
--- a/test/jdk/java/util/Collections/Disjoint.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/Disjoint.java Mon Nov 13 13:18:35 2017 -0800
@@ -34,7 +34,7 @@
public class Disjoint {
static final int N = 20;
- public static void main(String args[]) {
+ public static void main(String[] args) {
// Make an array of lists each of which shares a single element
// with its "neighbors," and no elements with other lists in the array
Random rnd = new Random();
--- a/test/jdk/java/util/Collections/EmptyNavigableMap.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/EmptyNavigableMap.java Mon Nov 13 13:18:35 2017 -0800
@@ -48,7 +48,7 @@
public class EmptyNavigableMap {
public static <T> void assertInstance(T actual, Class<? extends T> expected) {
- assertInstance(expected.isInstance(actual), null);
+ assertInstance(actual, expected, null);
}
public static <T> void assertInstance(T actual, Class<? extends T> expected, String message) {
--- a/test/jdk/java/util/Collections/EmptyNavigableSet.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/EmptyNavigableSet.java Mon Nov 13 13:18:35 2017 -0800
@@ -50,7 +50,7 @@
public class EmptyNavigableSet {
public static <T> void assertInstance(T actual, Class<? extends T> expected) {
- assertInstance(expected.isInstance(actual), null);
+ assertInstance(actual, expected, null);
}
public static <T> void assertInstance(T actual, Class<? extends T> expected, String message) {
--- a/test/jdk/java/util/Collections/Enum.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/Enum.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4323074
* @summary Basic test for new Enumeration -> List converter
--- a/test/jdk/java/util/Collections/FindSubList.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/FindSubList.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4323074
* @summary Basic test for Collections.indexOfSubList/lastIndexOfSubList
@@ -33,8 +33,8 @@
public static void main(String[] args) throws Exception {
int N = 500;
List source = new ArrayList(3 * N);
- List target[]= new List[N+1];
- int index[] = new int[N+1];
+ List[] target = new List[N+1];
+ int[] index = new int[N+1];
for (int i=0; i<=N; i++) {
List t = new ArrayList();
String s = Integer.toString(i, 2);
@@ -50,8 +50,12 @@
}
}
- List src[] = {source, new LinkedList(source), new Vector(source),
- Arrays.asList(source.toArray())};
+ List[] src = {
+ source,
+ new LinkedList(source),
+ new Vector(source),
+ Arrays.asList(source.toArray())
+ };
for (int j=0; j<src.length; j++) {
List s = src[j];
@@ -75,8 +79,12 @@
if (i != N)
index[i] = srcSize - index[i] - target[i].size();
}
- List src2[] = {source, new LinkedList(source), new Vector(source),
- Arrays.asList(source.toArray())};
+ List[] src2 = {
+ source,
+ new LinkedList(source),
+ new Vector(source),
+ Arrays.asList(source.toArray())
+ };
for (int j=0; j<src2.length; j++) {
List s = src2[j];
--- a/test/jdk/java/util/Collections/Frequency.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/Frequency.java Mon Nov 13 13:18:35 2017 -0800
@@ -32,7 +32,7 @@
public class Frequency {
static final int N = 100;
- public static void main(String args[]) {
+ public static void main(String[] args) {
test(new ArrayList<Integer>());
test(new LinkedList<Integer>());
}
--- a/test/jdk/java/util/Collections/NullComparator.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/NullComparator.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4224271
* @summary A null Comparator is now specified to indicate natural ordering.
@@ -37,7 +37,7 @@
List sorted = new ArrayList(list);
Collections.shuffle(list);
- Object a[] = list.toArray();
+ Object[] a = list.toArray();
Arrays.sort(a, null);
if (!Arrays.asList(a).equals(sorted))
throw new Exception("Arrays.sort");
--- a/test/jdk/java/util/Collections/ReplaceAll.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/ReplaceAll.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4323074
* @summary Basic test for new replaceAll algorithm
@@ -33,7 +33,7 @@
static final int SIZE = 20;
public static void main(String[] args) throws Exception {
- List a[] = {new ArrayList(), new LinkedList(), new Vector()};
+ List[] a = {new ArrayList(), new LinkedList(), new Vector()};
for (int i=0; i<a.length; i++) {
List lst = a[i];
--- a/test/jdk/java/util/Collections/Rotate.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/Rotate.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4323074
* @summary Basic test for new rotate algorithm
@@ -37,7 +37,7 @@
static Random rnd = new Random();
public static void main(String[] args) throws Exception {
- List a[] = {new ArrayList(), new LinkedList(), new Vector()};
+ List[] a = {new ArrayList(), new LinkedList(), new Vector()};
for (int i=0; i<a.length; i++) {
List lst = a[i];
--- a/test/jdk/java/util/Collections/RotateEmpty.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/RotateEmpty.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4389747
* @summary Collections.rotate(...) returns ArithmeticException
--- a/test/jdk/java/util/Collections/Ser.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/Ser.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4190323
* @summary EMPTY_SET, EMPTY_LIST, and the collections returned by
--- a/test/jdk/java/util/Collections/Swap.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/Swap.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4323074
* @summary Basic test for newly public swap algorithm
--- a/test/jdk/java/util/Collections/ViewSynch.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/ViewSynch.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4268780
* @summary Collection-views of submap-views of synchronized-views of
--- a/test/jdk/java/util/Collections/WrappedNull.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Collections/WrappedNull.java Mon Nov 13 13:18:35 2017 -0800
@@ -31,152 +31,152 @@
import java.util.*;
public class WrappedNull {
- public static void main(String argv[]) throws Exception {
- boolean testSucceeded = false;
- try {
- List l = Arrays.asList(null);
- }
- catch (NullPointerException e) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("Arrays.asList");
+ public static void main(String[] args) throws Exception {
+ boolean testSucceeded = false;
+ try {
+ List l = Arrays.asList(null);
+ }
+ catch (NullPointerException e) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("Arrays.asList");
- testSucceeded = false;
- try {
- Collection c = Collections.unmodifiableCollection(null);
- }
- catch (NullPointerException e) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("unmodifiableCollection");
+ testSucceeded = false;
+ try {
+ Collection c = Collections.unmodifiableCollection(null);
+ }
+ catch (NullPointerException e) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("unmodifiableCollection");
- testSucceeded = false;
- try {
- Set c = Collections.unmodifiableSet(null);
- }
- catch (NullPointerException e) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("unmodifiableSet");
+ testSucceeded = false;
+ try {
+ Set c = Collections.unmodifiableSet(null);
+ }
+ catch (NullPointerException e) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("unmodifiableSet");
- testSucceeded = false;
- try {
- List c = Collections.unmodifiableList(null);
- }
- catch (NullPointerException e) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("unmodifiableList");
+ testSucceeded = false;
+ try {
+ List c = Collections.unmodifiableList(null);
+ }
+ catch (NullPointerException e) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("unmodifiableList");
- testSucceeded = false;
- try {
- Map c = Collections.unmodifiableMap(null);
- }
- catch (NullPointerException e) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("unmodifiableMap");
+ testSucceeded = false;
+ try {
+ Map c = Collections.unmodifiableMap(null);
+ }
+ catch (NullPointerException e) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("unmodifiableMap");
- testSucceeded = false;
- try {
- SortedSet c = Collections.unmodifiableSortedSet(null);
- }
- catch (NullPointerException e) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("unmodifiableSortedSet");
+ testSucceeded = false;
+ try {
+ SortedSet c = Collections.unmodifiableSortedSet(null);
+ }
+ catch (NullPointerException e) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("unmodifiableSortedSet");
- testSucceeded = false;
- try {
- SortedMap c = Collections.unmodifiableSortedMap(null);
- }
- catch (NullPointerException e) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("unmodifiableSortedMap");
+ testSucceeded = false;
+ try {
+ SortedMap c = Collections.unmodifiableSortedMap(null);
+ }
+ catch (NullPointerException e) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("unmodifiableSortedMap");
- testSucceeded = false;
- try {
- Collection c = Collections.synchronizedCollection(null);
- }
- catch (NullPointerException e) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("synchronizedCollection");
+ testSucceeded = false;
+ try {
+ Collection c = Collections.synchronizedCollection(null);
+ }
+ catch (NullPointerException e) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("synchronizedCollection");
- testSucceeded = false;
- try {
- Set c = Collections.synchronizedSet(null);
- }
- catch (NullPointerException e) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("synchronizedSet");
+ testSucceeded = false;
+ try {
+ Set c = Collections.synchronizedSet(null);
+ }
+ catch (NullPointerException e) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("synchronizedSet");
- testSucceeded = false;
- try {
- List c = Collections.synchronizedList(null);
- }
- catch (NullPointerException e) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("synchronizedList");
+ testSucceeded = false;
+ try {
+ List c = Collections.synchronizedList(null);
+ }
+ catch (NullPointerException e) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("synchronizedList");
- testSucceeded = false;
- try {
- Map c = Collections.synchronizedMap(null);
- }
- catch (NullPointerException e) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("synchronizedMap");
+ testSucceeded = false;
+ try {
+ Map c = Collections.synchronizedMap(null);
+ }
+ catch (NullPointerException e) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("synchronizedMap");
- testSucceeded = false;
- try {
- SortedSet c = Collections.synchronizedSortedSet(null);
- }
- catch (NullPointerException e) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("synchronizedSortedSet");
+ testSucceeded = false;
+ try {
+ SortedSet c = Collections.synchronizedSortedSet(null);
+ }
+ catch (NullPointerException e) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("synchronizedSortedSet");
- testSucceeded = false;
- try {
- SortedMap c = Collections.synchronizedSortedMap(null);
- }
- catch (NullPointerException e) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("synchronizedSortedMap");
+ testSucceeded = false;
+ try {
+ SortedMap c = Collections.synchronizedSortedMap(null);
+ }
+ catch (NullPointerException e) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("synchronizedSortedMap");
- // Make sure that non-null arguments don't throw exc.
- List l = Arrays.asList(new Object[0]);
- Collection c = Collections.unmodifiableCollection(
- Collections.EMPTY_SET);
- Set s = Collections.unmodifiableSet(Collections.EMPTY_SET);
- l = Collections.unmodifiableList(Collections.EMPTY_LIST);
- Map m = Collections.unmodifiableMap(Collections.EMPTY_MAP);
- SortedSet ss = Collections.unmodifiableSortedSet(new TreeSet());
- SortedMap sm = Collections.unmodifiableSortedMap(new TreeMap());
+ // Make sure that non-null arguments don't throw exc.
+ List l = Arrays.asList(new Object[0]);
+ Collection c = Collections.unmodifiableCollection(
+ Collections.EMPTY_SET);
+ Set s = Collections.unmodifiableSet(Collections.EMPTY_SET);
+ l = Collections.unmodifiableList(Collections.EMPTY_LIST);
+ Map m = Collections.unmodifiableMap(Collections.EMPTY_MAP);
+ SortedSet ss = Collections.unmodifiableSortedSet(new TreeSet());
+ SortedMap sm = Collections.unmodifiableSortedMap(new TreeMap());
- c = Collections.synchronizedCollection(Collections.EMPTY_SET);
- s = Collections.synchronizedSet(Collections.EMPTY_SET);
- l = Collections.synchronizedList(Collections.EMPTY_LIST);
- m = Collections.synchronizedMap(Collections.EMPTY_MAP);
- ss = Collections.synchronizedSortedSet(new TreeSet());
- sm = Collections.synchronizedSortedMap(new TreeMap());
- }
+ c = Collections.synchronizedCollection(Collections.EMPTY_SET);
+ s = Collections.synchronizedSet(Collections.EMPTY_SET);
+ l = Collections.synchronizedList(Collections.EMPTY_LIST);
+ m = Collections.synchronizedMap(Collections.EMPTY_MAP);
+ ss = Collections.synchronizedSortedSet(new TreeSet());
+ sm = Collections.synchronizedSortedMap(new TreeMap());
+ }
}
--- a/test/jdk/java/util/HashMap/KeySetRemove.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/HashMap/KeySetRemove.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4286765
* @summary HashMap and TreeMap entrySet().remove(k) spuriously returned
@@ -31,8 +31,8 @@
import java.util.*;
public class KeySetRemove {
- public static void main(String args[]) throws Exception {
- Map m[] = {new HashMap(), new TreeMap()};
+ public static void main(String[] args) throws Exception {
+ Map[] m = {new HashMap(), new TreeMap()};
for (int i=0; i<m.length; i++) {
m[i].put("bananas", null);
if (!m[i].keySet().remove("bananas"))
--- a/test/jdk/java/util/HashMap/SetValue.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/HashMap/SetValue.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4627516
* @summary HashMap.Entry.setValue() returns new value (as opposed to old)
@@ -35,7 +35,7 @@
static final String oldValue = "old";
static final String newValue = "new";
- public static void main(String args[]) throws Exception {
+ public static void main(String[] args) throws Exception {
Map m = new HashMap();
m.put(key, oldValue);
Map.Entry e = (Map.Entry) m.entrySet().iterator().next();
--- a/test/jdk/java/util/HashMap/ToString.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/HashMap/ToString.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4189821
* @summary HashMap's entry.toString threw a null pointer exc if the HashMap
--- a/test/jdk/java/util/Hashtable/EqualsCast.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Hashtable/EqualsCast.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4208530
* @summary Hashtable was less robust to extension that it could have been
--- a/test/jdk/java/util/Hashtable/HashCode.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Hashtable/HashCode.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4559052
* @summary Hashtable's hashCode method always returns zero(!)
--- a/test/jdk/java/util/Hashtable/IllegalLoadFactor.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Hashtable/IllegalLoadFactor.java Mon Nov 13 13:18:35 2017 -0800
@@ -34,101 +34,100 @@
*/
public class IllegalLoadFactor {
- public static void main(String argv[]) throws Exception {
- boolean testSucceeded = false;
- try {
- // this should generate an IllegalArgumentException
- Hashtable bad1 = new Hashtable(100, -3);
- }
- catch (IllegalArgumentException e1) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("Hashtable, negative load factor");
+ public static void main(String[] args) throws Exception {
+ boolean testSucceeded = false;
+ try {
+ // this should generate an IllegalArgumentException
+ Hashtable bad1 = new Hashtable(100, -3);
+ }
+ catch (IllegalArgumentException e1) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("Hashtable, negative load factor");
- testSucceeded = false;
- try {
- // this should generate an IllegalArgumentException
- Hashtable bad1 = new Hashtable(100, Float.NaN);
- }
- catch (IllegalArgumentException e1) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("Hashtable, NaN load factor");
+ testSucceeded = false;
+ try {
+ // this should generate an IllegalArgumentException
+ Hashtable bad1 = new Hashtable(100, Float.NaN);
+ }
+ catch (IllegalArgumentException e1) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("Hashtable, NaN load factor");
- testSucceeded = false;
- try {
- // this should generate an IllegalArgumentException
- HashMap bad1 = new HashMap(100, -3);
- }
- catch (IllegalArgumentException e1) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("HashMap, negative load factor");
+ testSucceeded = false;
+ try {
+ // this should generate an IllegalArgumentException
+ HashMap bad1 = new HashMap(100, -3);
+ }
+ catch (IllegalArgumentException e1) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("HashMap, negative load factor");
- testSucceeded = false;
- try {
- // this should generate an IllegalArgumentException
- HashMap bad1 = new HashMap(100, Float.NaN);
- }
- catch (IllegalArgumentException e1) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("HashMap, NaN load factor");
+ testSucceeded = false;
+ try {
+ // this should generate an IllegalArgumentException
+ HashMap bad1 = new HashMap(100, Float.NaN);
+ }
+ catch (IllegalArgumentException e1) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("HashMap, NaN load factor");
- testSucceeded = false;
- try {
- // this should generate an IllegalArgumentException
- HashSet bad1 = new HashSet(100, -3);
- }
- catch (IllegalArgumentException e1) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("HashSet, negative load factor");
+ testSucceeded = false;
+ try {
+ // this should generate an IllegalArgumentException
+ HashSet bad1 = new HashSet(100, -3);
+ }
+ catch (IllegalArgumentException e1) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("HashSet, negative load factor");
- testSucceeded = false;
- try {
- // this should generate an IllegalArgumentException
- HashSet bad1 = new HashSet(100, Float.NaN);
- }
- catch (IllegalArgumentException e1) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("HashSet, NaN load factor");
+ testSucceeded = false;
+ try {
+ // this should generate an IllegalArgumentException
+ HashSet bad1 = new HashSet(100, Float.NaN);
+ }
+ catch (IllegalArgumentException e1) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("HashSet, NaN load factor");
- testSucceeded = false;
- try {
- // this should generate an IllegalArgumentException
- WeakHashMap bad1 = new WeakHashMap(100, -3);
- }
- catch (IllegalArgumentException e1) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("WeakHashMap, negative load factor");
+ testSucceeded = false;
+ try {
+ // this should generate an IllegalArgumentException
+ WeakHashMap bad1 = new WeakHashMap(100, -3);
+ }
+ catch (IllegalArgumentException e1) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("WeakHashMap, negative load factor");
- testSucceeded = false;
- try {
- // this should generate an IllegalArgumentException
- WeakHashMap bad1 = new WeakHashMap(100, Float.NaN);
- }
- catch (IllegalArgumentException e1) {
- testSucceeded = true;
- }
- if (!testSucceeded)
- throw new Exception("WeakHashMap, NaN load factor");
+ testSucceeded = false;
+ try {
+ // this should generate an IllegalArgumentException
+ WeakHashMap bad1 = new WeakHashMap(100, Float.NaN);
+ }
+ catch (IllegalArgumentException e1) {
+ testSucceeded = true;
+ }
+ if (!testSucceeded)
+ throw new Exception("WeakHashMap, NaN load factor");
- // Make sure that legal creates don't throw exceptions
- Map goodMap = new Hashtable(100, .69f);
- goodMap = new HashMap(100, .69f);
- Set goodSet = new HashSet(100, .69f);
- goodMap = new WeakHashMap(100, .69f);
- }
-
+ // Make sure that legal creates don't throw exceptions
+ Map goodMap = new Hashtable(100, .69f);
+ goodMap = new HashMap(100, .69f);
+ Set goodSet = new HashSet(100, .69f);
+ goodMap = new WeakHashMap(100, .69f);
+ }
}
--- a/test/jdk/java/util/Hashtable/SelfRef.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Hashtable/SelfRef.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4421469 6282555
* @summary Hashtable's toString method should detect self-referential
--- a/test/jdk/java/util/LinkedHashMap/Basic.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/LinkedHashMap/Basic.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4245809 8029795
* @summary Basic test for LinkedHashMap. (Based on MapBash)
--- a/test/jdk/java/util/LinkedHashMap/Cache.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/LinkedHashMap/Cache.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4245809
* @summary Basic test of removeEldestElement method.
--- a/test/jdk/java/util/LinkedHashMap/EmptyMapIterator.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/LinkedHashMap/EmptyMapIterator.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4473440
* @summary iterators on collection views of empty map weren't fail-fast.
@@ -30,7 +30,7 @@
import java.util.*;
public class EmptyMapIterator {
- public static void main(String args[]) throws Exception {
+ public static void main(String[] args) throws Exception {
HashMap map = new HashMap();
Iterator iter = iter = map.entrySet().iterator();
map.put("key", "value");
--- a/test/jdk/java/util/LinkedHashSet/Basic.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/LinkedHashSet/Basic.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4245809
* @summary Basic test for LinkedHashSet. (Based on SetBash)
@@ -133,9 +133,8 @@
}
static void AddRandoms(Set s, int n) throws Exception {
- for (int i=0; i<n; i++) {
- int r = rnd.nextInt() % n;
- Integer e = new Integer(r < 0 ? -r : r);
+ for (int i = 0; i < n; i++) {
+ Integer e = rnd.nextInt(n);
int preSize = s.size();
boolean prePresent = s.contains(e);
--- a/test/jdk/java/util/LinkedList/AddAll.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/LinkedList/AddAll.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4163207
* @summary AddAll was prepending instead of appending!
--- a/test/jdk/java/util/NavigableMap/LockStep.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/NavigableMap/LockStep.java Mon Nov 13 13:18:35 2017 -0800
@@ -848,11 +848,11 @@
}
interface Fun {void f() throws Throwable;}
static void THROWS(Class<? extends Throwable> k, Fun... fs) {
- for (Fun f : fs)
- try { f.f(); fail("Expected " + k.getName() + " not thrown"); }
- catch (Throwable t) {
- if (k.isAssignableFrom(t.getClass())) pass();
- else unexpected(t);}}
+ for (Fun f : fs)
+ try { f.f(); fail("Expected " + k.getName() + " not thrown"); }
+ catch (Throwable t) {
+ if (k.isAssignableFrom(t.getClass())) pass();
+ else unexpected(t);}}
static byte[] serializedForm(Object obj) {
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
--- a/test/jdk/java/util/Random/NextIntPowerOfTwoMod.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Random/NextIntPowerOfTwoMod.java Mon Nov 13 13:18:35 2017 -0800
@@ -21,7 +21,7 @@
* questions.
*/
-/**
+/*
* @test
* @bug 4187412
* @summary The FCS release of 1.2 did not special case the Random.nextInt
--- a/test/jdk/java/util/TreeMap/HeadTailTypeError.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/TreeMap/HeadTailTypeError.java Mon Nov 13 13:18:35 2017 -0800
@@ -31,7 +31,7 @@
import java.util.*;
public class HeadTailTypeError {
- public static void main(String argv[]) throws Exception {
+ public static void main(String[] args) throws Exception {
try {
SortedMap m = new TreeMap();
m.headMap(new Object());
--- a/test/jdk/java/util/TreeMap/SubMap.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/TreeMap/SubMap.java Mon Nov 13 13:18:35 2017 -0800
@@ -30,7 +30,7 @@
import java.util.*;
public class SubMap {
- public static void main(String args[]) throws Exception {
+ public static void main(String[] args) throws Exception {
SortedMap m = new TreeMap();
m.put(new Integer(1), new Integer(1));
m.put(new Integer(2), new Integer(2));
--- a/test/jdk/java/util/TreeMap/SubMapClear.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/TreeMap/SubMapClear.java Mon Nov 13 13:18:35 2017 -0800
@@ -39,7 +39,7 @@
Set subSet = treeSet.subSet(new Integer(4),new Integer(10));
subSet.clear(); // Used to throw exception
- int a[] = new int[] {1, 2, 3, 10};
+ int[] a = { 1, 2, 3, 10 };
Set s = new TreeSet();
for (int i = 0; i < a.length; i++)
s.add(new Integer(a[i]));
--- a/test/jdk/java/util/Vector/IllegalConstructorArgs.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Vector/IllegalConstructorArgs.java Mon Nov 13 13:18:35 2017 -0800
@@ -36,12 +36,12 @@
*/
public class IllegalConstructorArgs {
- public static void main(String argv[]) {
- int testSucceeded=0;
+ public static void main(String[] args) {
+ int testSucceeded=0;
try {
- // this should generate an IllegalArgumentException
- Vector bad1 = new Vector(-100, 10);
+ // this should generate an IllegalArgumentException
+ Vector bad1 = new Vector(-100, 10);
}
catch (IllegalArgumentException e1) {
testSucceeded =1;
--- a/test/jdk/java/util/Vector/LastIndexOf.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Vector/LastIndexOf.java Mon Nov 13 13:18:35 2017 -0800
@@ -31,7 +31,7 @@
import java.util.*;
public class LastIndexOf {
- public static void main(String argv[]) throws Exception {
+ public static void main(String[] args) throws Exception {
Vector v = new Vector(10);
try {
--- a/test/jdk/java/util/Vector/SyncLastIndexOf.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/Vector/SyncLastIndexOf.java Mon Nov 13 13:18:35 2017 -0800
@@ -46,7 +46,7 @@
}
}
- public static void main(String args[]) {
+ public static void main(String[] args) {
Integer x = new Integer(1);
v.addElement(x);
new RemovingThread().start();
--- a/test/jdk/java/util/WeakHashMap/ZeroInitCap.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/WeakHashMap/ZeroInitCap.java Mon Nov 13 13:18:35 2017 -0800
@@ -23,7 +23,7 @@
import java.util.*;
-/**
+/*
* @test
* @bug 4503146
* @summary Zero initial capacity should be legal
@@ -31,7 +31,7 @@
*/
public class ZeroInitCap {
- public static void main(String[] argv) {
+ public static void main(String[] args) {
Map map = new WeakHashMap(0);
map.put("a","b");
}
--- a/test/jdk/java/util/concurrent/ConcurrentHashMap/ToArray.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/concurrent/ConcurrentHashMap/ToArray.java Mon Nov 13 13:18:35 2017 -0800
@@ -43,7 +43,7 @@
}
static void executeTest() throws Throwable {
- final Throwable throwable[] = new Throwable[1];
+ final Throwable[] throwable = new Throwable[1];
final ConcurrentHashMap<Integer, Integer> m = new ConcurrentHashMap<>();
// Number of workers equal to the number of processors
--- a/test/jdk/java/util/concurrent/CountDownLatch/Basic.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/concurrent/CountDownLatch/Basic.java Mon Nov 13 13:18:35 2017 -0800
@@ -96,7 +96,7 @@
int count = 0;
Basic test = new Basic();
CountDownLatch latch = new CountDownLatch(3);
- Awaiter a[] = new Awaiter[12];
+ Awaiter[] a = new Awaiter[12];
for (int i = 0; i < 3; i++) {
CountDownLatch gate = new CountDownLatch(4);
@@ -125,7 +125,7 @@
int count = 0;
Basic test = new Basic();
CountDownLatch latch = new CountDownLatch(3);
- Awaiter a[] = new Awaiter[12];
+ Awaiter[] a = new Awaiter[12];
for (int i = 0; i < 3; i++) {
CountDownLatch gate = new CountDownLatch(4);
@@ -156,7 +156,7 @@
int count =0;
Basic test = new Basic();
CountDownLatch latch = new CountDownLatch(3);
- Awaiter a[] = new Awaiter[12];
+ Awaiter[] a = new Awaiter[12];
long[] timeout = { 0L, 5L, 10L };
--- a/test/jdk/java/util/concurrent/ExecutorService/Invoke.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/concurrent/ExecutorService/Invoke.java Mon Nov 13 13:18:35 2017 -0800
@@ -35,6 +35,7 @@
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -140,13 +141,17 @@
final boolean timed = rnd.nextBoolean();
final ExecutorService pool = Executors.newSingleThreadExecutor();
final AtomicLong count = new AtomicLong(0);
+ final CountDownLatch invokeAnyDone = new CountDownLatch(1);
class Task implements Callable<Long> {
public Long call() throws Exception {
long x = count.incrementAndGet();
check(x <= 2);
- if (x == 2)
- // wait for main thread to interrupt us
+ if (x == 2) {
+ // wait for main thread to interrupt us ...
awaitInterrupt(timeoutSeconds);
+ // ... and then for invokeAny to return
+ check(invokeAnyDone.await(timeoutSeconds, SECONDS));
+ }
return x;
}
}
@@ -166,6 +171,7 @@
else
val = pool.invokeAny(tasks);
check(val == 1);
+ invokeAnyDone.countDown();
// inherent race between main thread interrupt and
// start of second task
--- a/test/jdk/java/util/concurrent/ThreadPoolExecutor/FlakyThreadFactory.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/concurrent/ThreadPoolExecutor/FlakyThreadFactory.java Mon Nov 13 13:18:35 2017 -0800
@@ -57,12 +57,14 @@
}});
test(OutOfMemoryError.class,
new ThreadFactory() {
- public Thread newThread(Runnable r) {
- new Thread(null, r, "a natural OOME", 1L << 60);
- // """On some platforms, the value of the stackSize
- // parameter may have no effect whatsoever."""
- throw new OutOfMemoryError("artificial OOME");
- }});
+ @SuppressWarnings("DeadThread")
+ public Thread newThread(Runnable r) {
+ // We expect this to throw OOME, but ...
+ new Thread(null, r, "a natural OOME", 1L << 60);
+ // """On some platforms, the value of the stackSize
+ // parameter may have no effect whatsoever."""
+ throw new OutOfMemoryError("artificial OOME");
+ }});
test(null,
new ThreadFactory() {
public Thread newThread(Runnable r) {
--- a/test/jdk/java/util/concurrent/locks/Lock/FlakyMutex.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/concurrent/locks/Lock/FlakyMutex.java Mon Nov 13 13:18:35 2017 -0800
@@ -108,6 +108,7 @@
case 0: throw new MyError();
case 1: throw new MyRuntimeException();
case 2: FlakyMutex.<RuntimeException>uncheckedThrow(new MyException());
+ // fall through ... NOT!
default: return compareAndSetState(0, 1);
}
}
--- a/test/jdk/java/util/concurrent/tck/ConcurrentLinkedDequeTest.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/concurrent/tck/ConcurrentLinkedDequeTest.java Mon Nov 13 13:18:35 2017 -0800
@@ -936,6 +936,14 @@
}
}
+ void runAsync(Runnable r1, Runnable r2) {
+ boolean b = ThreadLocalRandom.current().nextBoolean();
+ CompletableFuture<Void> f1 = CompletableFuture.runAsync(b ? r1 : r2);
+ CompletableFuture<Void> f2 = CompletableFuture.runAsync(b ? r2 : r1);
+ f1.join();
+ f2.join();
+ }
+
/**
* Non-traversing Deque operations are linearizable.
* https://bugs.openjdk.java.net/browse/JDK-8188900
@@ -959,18 +967,9 @@
x, nulls.sum(), zeros.sum()));
};
- Runnable adder = () -> {
- d.addFirst(0);
- d.addLast(42);
- };
+ Runnable adder = () -> { d.addFirst(0); d.addLast(42); };
- boolean b = rnd.nextBoolean();
- Runnable r1 = b ? getter : adder;
- Runnable r2 = b ? adder : getter;
- CompletableFuture<Void> f1 = CompletableFuture.runAsync(r1);
- CompletableFuture<Void> f2 = CompletableFuture.runAsync(r2);
- f1.join();
- f2.join();
+ runAsync(getter, adder);
}
}
@@ -995,18 +994,48 @@
x, nulls.sum(), zeros.sum()));
};
- Runnable adder = () -> {
- d.addLast(0);
- d.addFirst(42);
- };
+ Runnable adder = () -> { d.addLast(0); d.addFirst(42); };
+
+ runAsync(getter, adder);
+ }
+ }
+
+ <T> T chooseRandomly(T... choices) {
+ return choices[ThreadLocalRandom.current().nextInt(choices.length)];
+ }
- boolean b = rnd.nextBoolean();
- Runnable r1 = b ? getter : adder;
- Runnable r2 = b ? adder : getter;
- CompletableFuture<Void> f1 = CompletableFuture.runAsync(r1);
- CompletableFuture<Void> f2 = CompletableFuture.runAsync(r2);
- f1.join();
- f2.join();
+ /**
+ * Non-traversing Deque operations (that return null) are linearizable.
+ * Don't return null when the deque is observably never empty.
+ * https://bugs.openjdk.java.net/browse/JDK-8189387
+ * ant -Djsr166.expensiveTests=true -Djsr166.tckTestClass=ConcurrentLinkedDequeTest -Djsr166.methodFilter=testBug8189387 tck
+ */
+ public void testBug8189387() {
+ final ThreadLocalRandom rnd = ThreadLocalRandom.current();
+ Object x = new Object();
+ for (int n = expensiveTests ? 100_000 : 10; n--> 0; ) {
+ ConcurrentLinkedDeque<Object> d = new ConcurrentLinkedDeque<>();
+ Runnable add = chooseRandomly(
+ () -> d.addFirst(x),
+ () -> d.offerFirst(x),
+ () -> d.addLast(x),
+ () -> d.offerLast(x));
+
+ Runnable get = chooseRandomly(
+ () -> assertFalse(d.isEmpty()),
+ () -> assertSame(x, d.peekFirst()),
+ () -> assertSame(x, d.peekLast()),
+ () -> assertSame(x, d.pollFirst()),
+ () -> assertSame(x, d.pollLast()));
+
+ Runnable addRemove = chooseRandomly(
+ () -> { d.addFirst(x); d.pollLast(); },
+ () -> { d.offerFirst(x); d.removeFirst(); },
+ () -> { d.offerLast(x); d.removeLast(); },
+ () -> { d.addLast(x); d.pollFirst(); });
+
+ add.run();
+ runAsync(get, addRemove);
}
}
}
--- a/test/jdk/java/util/concurrent/tck/CountedCompleterTest.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/concurrent/tck/CountedCompleterTest.java Mon Nov 13 13:18:35 2017 -0800
@@ -758,6 +758,8 @@
CCF f = new LCCF(8);
assertSame(f, f.fork());
helpQuiesce();
+ while (!f.isDone()) // wait out race
+ ;
assertEquals(21, f.number);
assertEquals(0, getQueuedTaskCount());
checkCompletedNormally(f);
--- a/test/jdk/java/util/concurrent/tck/NonNestmates.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/concurrent/tck/NonNestmates.java Mon Nov 13 13:18:35 2017 -0800
@@ -35,7 +35,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
--- a/test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java Mon Nov 13 13:18:35 2017 -0800
@@ -593,7 +593,7 @@
/**
* estimateMinimumDemand reports 0 until request, nonzero after
- * request, and zero again after delivery
+ * request
*/
public void testEstimateMinimumDemand() {
TestSubscriber s = new TestSubscriber();
@@ -604,9 +604,6 @@
assertEquals(0, p.estimateMinimumDemand());
s.sn.request(1);
assertEquals(1, p.estimateMinimumDemand());
- p.submit(1);
- s.awaitNext(1);
- assertEquals(0, p.estimateMinimumDemand());
}
/**
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/util/logging/FileHandlerPatternGeneration.java Mon Nov 13 13:18:35 2017 -0800
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.*;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.FileHandler;
+import java.util.logging.LogManager;
+
+/**
+ * @test
+ * @bug 8189953
+ * @summary tests the pattern generation algorithm
+ * @modules java.logging/java.util.logging:open
+ * @run main/othervm FileHandlerPatternGeneration
+ * @author danielfuchs
+ */
+public class FileHandlerPatternGeneration {
+
+ /**
+ * An array of strings where the elements at even indices are the input
+ * to give to FileHandler::generate(pattern, count, generation, unique),
+ * and the elements at the next odd index are a partially computed expected
+ * output, where %t, %h, %u, %g and file separator still need to be replaced.
+ * The final expected output is obtained by passing the partially computed
+ * output to FileHandlerPatternGeneration::generateExpected
+ * <p>
+ * The test verifies that {@code
+ * FileHandler.generate(PATTERN[i], c, g, u).toString()
+ * }
+ * is equal to {@code
+ * FileHandlerPatternGeneration.generateExpected(PATTERN[i],
+ * PATTERN[i+1],
+ * c, g, u)
+ * }
+ */
+ static final String[] PATTERNS = {
+ "C:/Workspace/hoge.log", "C:/Workspace/hoge.log",
+ "C:/Workspace%g/hoge.log", "C:/Workspace%g/hoge.log",
+ "C:/%uWorkspace/hoge.log", "C:/%uWorkspace/hoge.log",
+ "C:/%uWorkspace%g/hoge.log", "C:/%uWorkspace%g/hoge.log",
+ "C:/Workspace/%ghoge.log", "C:/Workspace/%ghoge.log",
+ "C:/Workspace/%ghoge%u.log", "C:/Workspace/%ghoge%u.log",
+ "C:/Workspace-%g/hoge.log", "C:/Workspace-%g/hoge.log",
+ "C:/Work%hspace/hoge.log", "%h/space/hoge.log",
+ "C:/Works%tpace%g/hoge.log", "%t/pace%g/hoge.log",
+ "C:/%uWork%hspace/hoge.log", "%h/space/hoge.log",
+ "C:/%uWorkspace%g/%thoge.log", "%t/hoge.log",
+ "C:/Workspace/%g%h%%hoge.log", "%h/%%hoge.log",
+ "C:/Work%h%%hspace/hoge.log", "%h/%%hspace/hoge.log",
+ "C:/Works%t%%hpace%g/hoge.log", "%t/%%hpace%g/hoge.log",
+ "C:/%uWork%h%%tspace/hoge.log", "%h/%%tspace/hoge.log",
+ "C:/%uWorkspace%g/%t%%hoge.log", "%t/%%hoge.log",
+ "C:/Workspace/%g%h%%hoge.log", "%h/%%hoge.log",
+ "ahaha", "ahaha",
+ "ahaha/ahabe", "ahaha/ahabe",
+ "../ahaha/ahabe", "../ahaha/ahabe",
+ "/x%ty/w/hoge.log", "%t/y/w/hoge.log",
+ "/x/%ty/w/hoge.log", "%t/y/w/hoge.log",
+ "/x%t/y/w/hoge.log", "%t/y/w/hoge.log",
+ "/x/%t/y/w/hoge.log", "%t/y/w/hoge.log",
+ "%ty/w/hoge.log", "%t/y/w/hoge.log",
+ "%t/y/w/hoge.log", "%t/y/w/hoge.log",
+ "/x%hy/w/hoge.log", "%h/y/w/hoge.log",
+ "/x/%hy/w/hoge.log", "%h/y/w/hoge.log",
+ "/x%h/y/w/hoge.log", "%h/y/w/hoge.log",
+ "/x/%h/y/w/hoge.log", "%h/y/w/hoge.log",
+ "%hy/w/hoge.log", "%h/y/w/hoge.log",
+ "%h/y/w/hoge.log", "%h/y/w/hoge.log",
+ "ahaha-%u-%g", "ahaha-%u-%g",
+ "ahaha-%g/ahabe-%u", "ahaha-%g/ahabe-%u",
+ "../ahaha-%u/ahabe", "../ahaha-%u/ahabe",
+ "/x%ty/w/hoge-%g.log", "%t/y/w/hoge-%g.log",
+ "/x/%ty/w/hoge-%u.log", "%t/y/w/hoge-%u.log",
+ "%u-%g/x%t/y/w/hoge.log", "%t/y/w/hoge.log",
+ "/x/%g%t%u/y/w/hoge.log", "%t/%u/y/w/hoge.log",
+ "%ty/w-%g/hoge.log", "%t/y/w-%g/hoge.log",
+ "%t/y/w-%u/hoge.log", "%t/y/w-%u/hoge.log",
+ "/x%hy/%u-%g-w/hoge.log", "%h/y/%u-%g-w/hoge.log",
+ "/x/%hy/w-%u-%g/hoge.log", "%h/y/w-%u-%g/hoge.log",
+ "/x%h/y/w/%u-%ghoge.log", "%h/y/w/%u-%ghoge.log",
+ "/x/%h/y/w/hoge-%u-%g.log", "%h/y/w/hoge-%u-%g.log",
+ "%hy/w/%u-%g-hoge.log", "%h/y/w/%u-%g-hoge.log",
+ "%h/y/w/hoge-%u-%g.log", "%h/y/w/hoge-%u-%g.log",
+ "/x/y/z/hoge-%u.log", "/x/y/z/hoge-%u.log",
+ };
+
+ // the (count, generation, unique) parameters to pass to
+ // FileHandler.generate(pattern, count, generation, unique)
+ static final int[][] GENERATIONS = {
+ {0, 0, 0},
+ {0, 1, 0},
+ {0, 1, 1},
+ {1, 1, 0},
+ {1, 1, 1},
+ {1, 1, 2},
+ {1, 2, 3},
+ {3, 4, 0},
+ {3, 4, 1},
+ {3, 4, 2},
+ {3, 0, 5},
+ {3, 1, 5},
+ {3, 2, 5},
+ };
+
+ static final Class<FileHandler> FILE_HANDLER_CLASS = FileHandler.class;
+ static final Method GENERATE;
+ static final String USER_HOME;
+ static final String TMP;
+ static {
+ Method generate;
+ try {
+ generate = FILE_HANDLER_CLASS.getDeclaredMethod("generate",
+ String.class,
+ int.class,
+ int.class,
+ int.class);
+ generate.setAccessible(true);
+ } catch (Exception e) {
+ throw new ExceptionInInitializerError(e);
+ }
+ GENERATE = generate;
+ USER_HOME = System.getProperty("user.home");
+ TMP = System.getProperty("java.io.tmpdir", USER_HOME);
+ }
+
+ public static void main(String... args) throws Throwable {
+
+ for (int i=0; i < PATTERNS.length; i+=2) {
+ String s = PATTERNS[i];
+ String partial = PATTERNS[i+1];
+ System.out.println("generate: " + s);
+ for (int[] gen : GENERATIONS) {
+ String expected = generateExpected(s, partial, gen[0], gen[1], gen[2]);
+ String output = generate(s, gen[0], gen[1], gen[2]).toString();
+ System.out.println("\t" + Arrays.toString(gen)+ ": " + output);
+ if (!expected.equals(output)) {
+ throw new RuntimeException("test failed for \""
+ + s +"\" " + Arrays.toString(gen) + ": "
+ + "\n\tgenerated: \"" + output +"\""
+ + "\n\t expected: \"" + expected +"\"");
+ }
+ }
+ }
+
+ }
+
+ // Strip the trailing separator from the string, if present
+ static String stripTrailingSeparator(String s) {
+ if (s.endsWith("/")) {
+ return s.substring(0, s.length() -1);
+ } else if (s.endsWith(File.separator)) {
+ return s.substring(0, s.length() - File.separator.length());
+ } else {
+ return s;
+ }
+ }
+
+ /**
+ * Compute the final expected output from a partially computed output found
+ * at PATTERNS[i+1]
+ * @param s The pattern string, found at PATTERN[i]
+ * (with i % 2 == 0)
+ * @param partial The partially computed output, found at PATTERN[i+1]
+ * @param count The count parameter given to FileHandler::generate
+ * @param generation The generation parameter given to FileHandler::generate
+ * @param unique The unique parameter given to FileHandler::generate
+ * @return The expected output that FileHandler.generate(s, count, gen, unique)
+ * should produce.
+ */
+ static String generateExpected(String s, String partial,
+ int count, int generation, int unique)
+ {
+ boolean sawu = s.replace("%%", "$$$$").contains("%u");
+ boolean sawg = s.replace("%%", "$$$$").contains("%g");
+ String result = partial.replace("%%", "$$$$");
+ String tmp = stripTrailingSeparator(TMP);
+ String home = stripTrailingSeparator(USER_HOME);
+ result = result.replace("%h", home);
+ result = result.replace("%t", tmp);
+ result = result.replace("%g", String.valueOf(generation));
+ result = result.replace("%u", String.valueOf(unique));
+ result = result.replace("$$$$", "%");
+ result = result.replace("/", File.separator);
+ if (count > 1 && !sawg) {
+ result = result + "." + generation;
+ }
+ if (unique > 0 && !sawu) {
+ result = result + "." + unique;
+ }
+ return result;
+ }
+
+ // Calls FileHandler.generate(s, count, generation, unique) through reflection
+ static File generate(String s, int count, int generation, int unique)
+ throws Throwable
+ {
+ try {
+ return (File) GENERATE.invoke(null, s, count, generation, unique);
+ } catch (InvocationTargetException e) {
+ throw e.getCause();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/net/Sockets/QuickAckTest.java Mon Nov 13 13:18:35 2017 -0800
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ /*
+ * @test
+ * @bug 8145635
+ * @summary Add TCP_QUICKACK socket option
+ * @modules jdk.net
+ * @run main QuickAckTest
+ */
+import java.io.IOException;
+import java.net.DatagramSocket;
+import java.net.MulticastSocket;
+import java.net.ServerSocket;
+import java.net.Socket;
+import jdk.net.ExtendedSocketOptions;
+import jdk.net.Sockets;
+
+public class QuickAckTest {
+
+ private static final String LOCAL_HOST = "127.0.0.1";
+
+ public static void main(String args[]) throws IOException {
+
+ try (ServerSocket ss = new ServerSocket(0);
+ Socket s = new Socket(LOCAL_HOST, ss.getLocalPort());
+ DatagramSocket ds = new DatagramSocket(0);
+ MulticastSocket mc = new MulticastSocket(0)) {
+
+ if (ss.supportedOptions().contains(ExtendedSocketOptions.TCP_QUICKACK)) {
+ Sockets.setOption(ss, ExtendedSocketOptions.TCP_QUICKACK, true);
+ if (!ss.getOption(ExtendedSocketOptions.TCP_QUICKACK)) {
+ throw new RuntimeException("Test failed, TCP_QUICKACK should"
+ + " have been set");
+ }
+ }
+ if (s.supportedOptions().contains(ExtendedSocketOptions.TCP_QUICKACK)) {
+ Sockets.setOption(s, ExtendedSocketOptions.TCP_QUICKACK, true);
+ if (!s.getOption(ExtendedSocketOptions.TCP_QUICKACK)) {
+ throw new RuntimeException("Test failed, TCP_QUICKACK should"
+ + " have been set");
+ }
+ }
+ if (ds.supportedOptions().contains(ExtendedSocketOptions.TCP_QUICKACK)) {
+ throw new RuntimeException("Test failed, TCP_QUICKACK is applicable"
+ + " for TCP Sockets only.");
+ }
+ if (mc.supportedOptions().contains(ExtendedSocketOptions.TCP_QUICKACK)) {
+ throw new RuntimeException("Test failed, TCP_QUICKACK is applicable"
+ + " for TCP Sockets only");
+ }
+ }
+ }
+}
--- a/test/jdk/sun/util/calendar/zi/tzdata/VERSION Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/sun/util/calendar/zi/tzdata/VERSION Mon Nov 13 13:18:35 2017 -0800
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2017b
+tzdata2017c
--- a/test/jdk/sun/util/calendar/zi/tzdata/africa Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/sun/util/calendar/zi/tzdata/africa Mon Nov 13 13:18:35 2017 -0800
@@ -49,7 +49,7 @@
#
# For data circa 1899, a common source is:
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
+# https://www.jstor.org/stable/1774359
#
# A reliable and entertaining source about time zones is
# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
@@ -241,7 +241,7 @@
# saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
# http://www.nentjes.info/Bill/bill5.htm
-# http://www.timeanddate.com/worldclock/city.html?n=53
+# https://www.timeanddate.com/worldclock/city.html?n=53
# From Steffen Thorsen (2007-09-04): The official information...:
# http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
Rule Egypt 2007 only - Sep Thu>=1 24:00 0 -
@@ -279,8 +279,8 @@
# timeanddate[2] and another site I've found[3] also support that.
#
# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
+# [2] https://www.timeanddate.com/worldclock/clockchange.html?n=53
+# [3] https://wwp.greenwichmeantime.com/time-zone/africa/egypt/
# From Arthur David Olson (2009-04-20):
# In 2009 (and for the next several years), Ramadan ends before the fourth
@@ -290,10 +290,10 @@
# From Steffen Thorsen (2009-08-11):
# We have been able to confirm the August change with the Egyptian Cabinet
# Information and Decision Support Center:
-# http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
+# https://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
#
# The Middle East News Agency
-# http://www.mena.org.eg/index.aspx
+# https://www.mena.org.eg/index.aspx
# also reports "Egypt starts winter time on August 21"
# today in article numbered "71, 11/08/2009 12:25 GMT."
# Only the title above is available without a subscription to their service,
@@ -343,7 +343,7 @@
# Thursday of April.... Clocks will still be turned back for Ramadan, but
# dates not yet announced....
# http://almogaz.com/news/weird-news/2015/04/05/1947105 ...
-# http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html
+# https://www.timeanddate.com/news/time/egypt-starts-dst-2015.html
# From Ahmed Nazmy (2015-04-20):
# Egypt's ministers cabinet just announced ... that it will cancel DST at
@@ -470,11 +470,11 @@
# From Even Scharning (2012-11-10):
# Libya set their time one hour back at 02:00 on Saturday November 10.
-# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/
+# https://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/
# Here is an official source [in Arabic]: http://ls.ly/fb6Yc
#
# Steffen Thorsen forwarded a translation (2012-11-10) in
-# http://mm.icann.org/pipermail/tz/2012-November/018451.html
+# https://mm.icann.org/pipermail/tz/2012-November/018451.html
#
# From Tim Parenti (2012-11-11):
# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1.
@@ -485,7 +485,7 @@
# From Even Scharning (2013-10-25):
# The scheduled end of DST in Libya on Friday, October 25, 2013 was
# cancelled yesterday....
-# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
+# https://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
#
# From Paul Eggert (2013-10-25):
# For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
@@ -538,7 +538,7 @@
# basis....
# It seems that Mauritius observed daylight saving time from 1982-10-10 to
# 1983-03-20 as well, but that was not successful....
-# http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html
+# https://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html
# From Alex Krivenyshev (2008-06-25):
# http://economicdevelopment.gov.mu/portal/site/Mainhomepage/menuitem.a42b24128104d9845dabddd154508a0c/?content_id=0a7cee8b5d69a110VgnVCM1000000a04a8c0RCRD
@@ -606,7 +606,7 @@
# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
#
# Our wrap-up:
-# http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
+# https://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
# From Arthur David Olson (2009-07-11):
# The "mauritius-dst-will-not-repeat" wrapup includes this:
@@ -638,7 +638,7 @@
# be one hour ahead of GMT between 1 June and 27 September, according to
# Communication Minister and Government Spokesman, Khalid Naciri...."
#
-# http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
+# http://www.worldtimezone.com/dst_news/dst_news_morocco01.html
# http://en.afrik.com/news11892.html
# From Alex Krivenyshev (2008-05-09):
@@ -651,7 +651,7 @@
# From Patrice Scattolin (2008-05-09):
# According to this article:
-# http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
+# https://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
# (and republished here: <http://www.actu.ma/heure-dete-comment_i127896_0.html>)
# the changes occur at midnight:
#
@@ -673,7 +673,7 @@
# posted in English).
#
# The following Google query will generate many relevant hits:
-# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
+# https://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
# From Steffen Thorsen (2008-08-27):
# Morocco will change the clocks back on the midnight between August 31
@@ -684,7 +684,7 @@
# http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
#
# We have some further details posted here:
-# http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
+# https://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
# From Steffen Thorsen (2009-03-17):
# Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
@@ -694,7 +694,7 @@
# (French)
#
# Our summary:
-# http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
+# https://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
# From Alexander Krivenyshev (2009-03-17):
# Here is a link to official document from Royaume du Maroc Premier Ministre,
@@ -717,7 +717,7 @@
# http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
# (French)
# Our page:
-# http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
+# https://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
# From Dan Abitol (2011-03-30):
# ...Rules for Africa/Casablanca are the following (24h format)
@@ -734,7 +734,7 @@
# They said that the decision was already taken.
#
# More articles in the press
-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
+# https://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
# http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
@@ -826,7 +826,7 @@
# 1433 (18 April 2012) and the decision of the Head of Government of
# 16 N. 3-29-15 Chaaban 1435 (4 June 2015).
# Source (french):
-# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
+# https://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
#
# From Milamber (2015-06-09):
# http://www.mmsp.gov.ma/fr/actualites.aspx?id=863
@@ -835,7 +835,7 @@
# [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go
# from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch....
# I think the patch is correct and the quoted text is wrong; the text in
-# <http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/> agrees
+# <https://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/> agrees
# with the patch.
# From Paul Eggert (2015-06-08):
@@ -960,9 +960,17 @@
Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo
Link Africa/Maputo Africa/Lusaka # Zambia
+
# Namibia
-# The 1994-04-03 transition is from Shanks & Pottenger.
-# Shanks & Pottenger report no DST after 1998-04; go with IATA.
+
+# From Arthur David Olson (2017-08-09):
+# The text of the "Namibia Time Act, 1994" is available online at
+# www.lac.org.na/laws/1994/811.pdf
+# and includes this nugget:
+# Notwithstanding the provisions of subsection (2) of section 1, the
+# first winter period after the commencement of this Act shall
+# commence at OOhOO on Monday 21 March 1994 and shall end at 02h00 on
+# Sunday 4 September 1994.
# From Petronella Sibeene (2007-03-30):
# http://allafrica.com/stories/200703300178.html
@@ -978,19 +986,30 @@
# observes Botswana time, we have no details about historical practice.
# In the meantime people there can use Africa/Gaborone.
# See: Immanuel S. The Namibian. 2017-02-23.
-# http://www.namibian.com.na/51480/read/Time-change-divides-lawmakers
+# https://www.namibian.com.na/51480/read/Time-change-divides-lawmakers
+
+# From Steffen Thorsen (2017-08-09):
+# Namibia is going to change their time zone to what is now their DST:
+# https://www.newera.com.na/2017/02/23/namibias-winter-time-might-be-repealed/
+# This video is from the government decision:
+# https://www.nbc.na/news/na-passes-namibia-time-bill-repealing-1994-namibia-time-act.8665
+# We have made the assumption so far that they will change their time zone at
+# the same time they would normally start DST, the first Sunday in September:
+# https://www.timeanddate.com/news/time/namibia-new-time-zone.html
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Namibia 1994 max - Sep Sun>=1 2:00 1:00 S
-Rule Namibia 1995 max - Apr Sun>=1 2:00 0 -
+Rule Namibia 1994 only - Mar 21 0:00 0 -
+Rule Namibia 1994 2016 - Sep Sun>=1 2:00 1:00 S
+Rule Namibia 1995 2017 - Apr Sun>=1 2:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8
1:30 - +0130 1903 Mar
2:00 - SAST 1942 Sep 20 2:00
2:00 1:00 SAST 1943 Mar 21 2:00
2:00 - SAST 1990 Mar 21 # independence
- 2:00 - CAT 1994 Apr 3
- 1:00 Namibia WA%sT
+ 2:00 - CAT 1994 Mar 21 0:00
+ 1:00 Namibia WA%sT 2017 Sep 3 2:00
+ 2:00 - CAT
# Niger
# See Africa/Lagos.
@@ -1077,14 +1096,24 @@
# no information
# Sudan
-#
+
# From <http://www.sunanews.net/sn13jane.html>
# Sudan News Agency (2000-01-13),
# also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen:
# Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
# Saturday.... This was announced Thursday by Caretaker State Minister for
# Manpower Abdul-Rahman Nur-Eddin.
+
+# From Ahmed Atyya, National Telecommunications Corp. (NTC), Sudan (2017-10-17):
+# ... the Republic of Sudan is going to change the time zone from (GMT+3:00)
+# to (GMT+ 2:00) starting from Wednesday 1 November 2017.
#
+# From Paul Eggert (2017-10-18):
+# A scanned copy (in Arabic) of Cabinet Resolution No. 352 for the
+# year 2017 can be found as an attachment in email today from Yahia
+# Abdalla of NTC, archived at:
+# https://mm.icann.org/pipermail/tz/2017-October/025333.html
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Sudan 1970 only - May 1 0:00 1:00 S
Rule Sudan 1970 1985 - Oct 15 0:00 0 -
@@ -1093,10 +1122,14 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Khartoum 2:10:08 - LMT 1931
2:00 Sudan CA%sT 2000 Jan 15 12:00
- 3:00 - EAT
+ 3:00 - EAT 2017 Nov 1
+ 2:00 - CAT
# South Sudan
-Link Africa/Khartoum Africa/Juba
+# Zone NAME GMTOFF RULES FORMAT [UNTIL]
+Zone Africa/Juba 2:06:28 - LMT 1931
+ 2:00 Sudan CA%sT 2000 Jan 15 12:00
+ 3:00 - EAT
# Swaziland
# See Africa/Johannesburg.
@@ -1134,11 +1167,11 @@
# According to several news sources, Tunisia will not observe DST this year.
# (Arabic)
# http://www.elbashayer.com/?page=viewn&nid=42546
-# http://www.babnet.net/kiwidetail-15295.asp
+# https://www.babnet.net/kiwidetail-15295.asp
#
# We have also confirmed this with the US embassy in Tunisia.
# We have a wrap-up about this on the following page:
-# http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
+# https://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
# From Alexander Krivenyshev (2009-03-17):
# Here is a link to Tunis Afrique Presse News Agency
--- a/test/jdk/sun/util/calendar/zi/tzdata/antarctica Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/sun/util/calendar/zi/tzdata/antarctica Mon Nov 13 13:18:35 2017 -0800
@@ -49,7 +49,7 @@
# Heard Island, McDonald Islands (uninhabited)
# previously sealers and scientific personnel wintered
# Margaret Turner reports
-# http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
+# https://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
# (1999-09-30) that they're UT +05, with no DST;
# presumably this is when they have visitors.
#
@@ -70,7 +70,7 @@
# http://www.aad.gov.au/default.asp?casid=37079
#
# We have more background information here:
-# http://www.timeanddate.com/news/time/antarctica-new-times.html
+# https://www.timeanddate.com/news/time/antarctica-new-times.html
# From Steffen Thorsen (2010-03-10):
# We got these changes from the Australian Antarctic Division: ...
@@ -85,7 +85,7 @@
# - Mawson station stays on UTC+5.
#
# Background:
-# http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
+# https://www.timeanddate.com/news/time/antartica-time-changes-2010.html
# From Steffen Thorsen (2016-10-28):
# Australian Antarctica Division informed us that Casey changed time
@@ -168,7 +168,7 @@
#
# year-round base in the main continent
# Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
-# <http://en.wikipedia.org/wiki/Dumont_d'Urville_Station> (2005-12-05)
+# <https://en.wikipedia.org/wiki/Dumont_d'Urville_Station> (2005-12-05)
#
# Another base at Port-Martin, 50km east, began operation in 1947.
# It was destroyed by fire on 1952-01-14.
--- a/test/jdk/sun/util/calendar/zi/tzdata/asia Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/sun/util/calendar/zi/tzdata/asia Mon Nov 13 13:18:35 2017 -0800
@@ -49,7 +49,7 @@
#
# For data circa 1899, a common source is:
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
+# https://www.jstor.org/stable/1774359
#
# For Russian data circa 1919, a source is:
# Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
@@ -98,8 +98,8 @@
Rule RussiaAsia 1981 1984 - Apr 1 0:00 1:00 S
Rule RussiaAsia 1981 1983 - Oct 1 0:00 0 -
Rule RussiaAsia 1984 1995 - Sep lastSun 2:00s 0 -
-Rule RussiaAsia 1985 2011 - Mar lastSun 2:00s 1:00 S
-Rule RussiaAsia 1996 2011 - Oct lastSun 2:00s 0 -
+Rule RussiaAsia 1985 2010 - Mar lastSun 2:00s 1:00 S
+Rule RussiaAsia 1996 2010 - Oct lastSun 2:00s 0 -
# Afghanistan
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -132,13 +132,17 @@
# or
# (brief)
# http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Armenia 2011 only - Mar lastSun 2:00s 1:00 S
+Rule Armenia 2011 only - Oct lastSun 2:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Yerevan 2:58:00 - LMT 1924 May 2
3:00 - +03 1957 Mar
4:00 RussiaAsia +04/+05 1991 Mar 31 2:00s
3:00 RussiaAsia +03/+04 1995 Sep 24 2:00s
4:00 - +04 1997
- 4:00 RussiaAsia +04/+05
+ 4:00 RussiaAsia +04/+05 2011
+ 4:00 Armenia +04/+05
# Azerbaijan
@@ -150,7 +154,7 @@
# From Steffen Thorsen (2016-03-17):
# ... the Azerbaijani Cabinet of Ministers has cancelled switching to
# daylight saving time....
-# http://www.azernews.az/azerbaijan/94137.html
+# https://www.azernews.az/azerbaijan/94137.html
# http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-daylight-saving-time.html
# http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
@@ -191,11 +195,11 @@
# the 19th and 20th, and they have not set the end date yet.
#
# Some sources:
-# http://in.reuters.com/article/southAsiaNews/idINIndia-40017620090601
+# https://in.reuters.com/article/southAsiaNews/idINIndia-40017620090601
# http://bdnews24.com/details.php?id=85889&cid=2
#
# Our wrap-up:
-# http://www.timeanddate.com/news/time/bangladesh-daylight-saving-2009.html
+# https://www.timeanddate.com/news/time/bangladesh-daylight-saving-2009.html
# From A. N. M. Kamrus Saadat (2009-06-15):
# Finally we've got the official mail regarding DST start time where DST start
@@ -281,9 +285,15 @@
# Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
+# From Paul Eggert (2017-04-20):
+# Page 27 of Reed & Low (cited for Asia/Kolkata) says "Rangoon local time is
+# used upon the railways and telegraphs of Burma, and is 6h. 24m. 47s. ahead
+# of Greenwich." This refers to the period before Burma's transition to +0630,
+# a transition for which Shanks is the only source.
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Yangon 6:24:40 - LMT 1880 # or Rangoon
- 6:24:40 - RMT 1920 # Rangoon Mean Time?
+Zone Asia/Yangon 6:24:47 - LMT 1880 # or Rangoon
+ 6:24:47 - RMT 1920 # Rangoon local time
6:30 - +0630 1942 May
9:00 - +09 1945 May 3
6:30 - +0630
@@ -340,7 +350,7 @@
#
# From Jesper Nørgaard Welen (2006-07-14):
# I have investigated the timezones around 1970 on the
-# http://www.astro.com/atlas site [with provinces and county
+# https://www.astro.com/atlas site [with provinces and county
# boundaries summarized below].... A few other exceptions were two
# counties on the Sichuan side of the Xizang-Sichuan border,
# counties Dege and Baiyu which lies on the Sichuan side and are
@@ -492,7 +502,7 @@
# From David Cochrane (2014-03-26):
# Just a confirmation that Ürümqi time was implemented in Ürümqi on 1 Feb 1986:
-# http://content.time.com/time/magazine/article/0,9171,960684,00.html
+# https://content.time.com/time/magazine/article/0,9171,960684,00.html
# From Luther Ma (2014-04-22):
# I have interviewed numerous people of various nationalities and from
@@ -649,7 +659,7 @@
# (both in Okinawa) adopt the Western Standard Time which is based on
# 120E. The adoption began from Jan 1, 1896. The original text can be
# found on Wikisource:
-# http://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
+# https://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
# ... This could be the first adoption of time zone in Taiwan, because
# during the Qing Dynasty, it seems that there was no time zone
# declared officially.
@@ -662,7 +672,7 @@
# territory, including later occupations, adopt Japan Central Time
# (UTC+9). The adoption began on Oct 1, 1937. The original text can
# be found on Wikisource:
-# http://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
+# https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
#
# That is, the time zone of Taipei switched to UTC+9 on Oct 1, 1937.
@@ -798,6 +808,12 @@
# Looks like the time zone split in Cyprus went through last night.
# http://cyprus-mail.com/2016/10/30/cyprus-new-division-two-time-zones-now-reality/
+# From Paul Eggert (2017-10-18):
+# Northern Cyprus will reinstate winter time on October 29, thus
+# staying in sync with the rest of Cyprus. See: Anastasiou A.
+# Cyprus to remain united in time. Cyprus Mail 2017-10-17.
+# https://cyprus-mail.com/2017/10/17/cyprus-remain-united-time/
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Cyprus 1975 only - Apr 13 0:00 1:00 S
Rule Cyprus 1975 only - Oct 12 0:00 0 -
@@ -815,7 +831,8 @@
Zone Asia/Famagusta 2:15:48 - LMT 1921 Nov 14
2:00 Cyprus EE%sT 1998 Sep
2:00 EUAsia EE%sT 2016 Sep 8
- 3:00 - +03
+ 3:00 - +03 2017 Oct 29 1:00u
+ 2:00 EUAsia EE%sT
# Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
# However, for various reasons many users expect to find it under Europe.
@@ -875,7 +892,7 @@
# From João Carrascalão, brother of the former governor of East Timor, in
# East Timor may be late for its millennium
-# <http://etan.org/et99c/december/26-31/30ETMAY.htm> (1999-12-26/31):
+# <https://etan.org/et99c/december/26-31/30ETMAY.htm> (1999-12-26/31):
# Portugal tried to change the time forward in 1974 because the sun
# rises too early but the suggestion raised a lot of problems with the
# Timorese and I still don't think it would work today because it
@@ -903,21 +920,62 @@
# India
# From Ian P. Beacock, in "A brief history of (modern) time", The Atlantic
-# http://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
+# https://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
# (2015-12-22):
# In January 1906, several thousand cotton-mill workers rioted on the
# outskirts of Bombay.... They were protesting the proposed abolition of
# local time in favor of Indian Standard Time.... Journalists called this
# dispute the "Battle of the Clocks." It lasted nearly half a century.
+# From Paul Eggert (2017-04-20):
+# Good luck trying to nail down old timekeeping records in India.
+# "... in the nineteenth century ... Madras Observatory took its magnetic
+# measurements on Göttingen time, its meteorological measurements on Madras
+# (local) time, dropped its time ball on Greenwich (ocean navigator's) time,
+# and distributed civil (local time)." -- Bartky IR. Selling the true time:
+# 19th-century timekeeping in america. Stanford U Press (2000), 247 note 19.
+# "A more potent cause of resistance to the general adoption of the present
+# standard time lies in the fact that it is Madras time. The citizen of
+# Bombay, proud of being 'primus in Indis' and of Calcutta, equally proud of
+# his city being the Capital of India, and - for a part of the year - the Seat
+# of the Supreme Government, alike look down on Madras, and refuse to change
+# the time they are using, for that of what they regard as a benighted
+# Presidency; while Madras, having for long given the standard time to the
+# rest of India, would resist the adoption of any other Indian standard in its
+# place." -- Oldham RD. On Time in India: a suggestion for its improvement.
+# Proceedings of the Asiatic Society of Bengal (April 1899), 49-55.
+#
+# "In 1870 ... Madras time - 'now used by the telegraph and regulated from the
+# only government observatory' - was suggested as a standard railway time,
+# first to be adopted on the Great Indian Peninsular Railway (GIPR)....
+# Calcutta, Bombay, and Karachi, were to be allowed to continue with their
+# local time for civil purposes." - Prasad R. Tracks of Change: Railways and
+# Everyday Life in Colonial India. Cambridge University Press (2016), 145.
+#
+# Reed S, Low F. The Indian Year Book 1936-37. Bennett, Coleman, pp 27-8.
+# https://archive.org/details/in.ernet.dli.2015.282212
+# This lists +052110 as Madras local time used in railways, and says that on
+# 1906-01-01 railways and telegraphs in India switched to +0530. Some
+# municipalities retained their former time, and the time in Calcutta
+# continued to depend on whether you were at the railway station or at
+# government offices. Government time was at +055320 (according to Shanks) or
+# at +0554 (according to the Indian Year Book). Railway time is more
+# appropriate for our purposes, as it was better documented, it is what we do
+# elsewhere (e.g., Europe/London before 1880), and after 1906 it was
+# consistent in the region now identified by Asia/Kolkata. So, use railway
+# time for 1870-1941. Shanks is our only (and dubious) source for the
+# 1941-1945 data.
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata
- 5:53:20 - HMT 1941 Oct # Howrah Mean Time?
- 6:30 - +0630 1942 May 15
+Zone Asia/Kolkata 5:53:28 - LMT 1854 Jun 28 # Kolkata
+ 5:53:20 - HMT 1870 # Howrah Mean Time?
+ 5:21:10 - MMT 1906 Jan 1 # Madras local time
+ 5:30 - IST 1941 Oct
+ 5:30 1:00 +0630 1942 May 15
5:30 - IST 1942 Sep
5:30 1:00 +0630 1945 Oct 15
5:30 - IST
-# The following are like Asia/Kolkata:
+# Since 1970 the following are like Asia/Kolkata:
# Andaman Is
# Lakshadweep (Laccadive, Minicoy and Amindivi Is)
# Nicobar Is
@@ -1059,7 +1117,7 @@
# From Reuters (2007-09-16), with a heads-up from Jesper Nørgaard Welen:
# ... the Guardian Council ... approved a law on Sunday to re-introduce
# daylight saving time ...
-# http://uk.reuters.com/article/oilRpt/idUKBLA65048420070916
+# https://uk.reuters.com/article/oilRpt/idUKBLA65048420070916
#
# From Roozbeh Pournader (2007-11-05):
# This is quoted from Official Gazette of the Islamic Republic of
@@ -1158,7 +1216,7 @@
# http://www.aswataliraq.info/look/article.tpl?id=2047&IdLanguage=17&IdPublication=4&NrArticle=71743&NrIssue=1&NrSection=10
#
# We have published a short article in English about the change:
-# http://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
+# https://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Iraq 1982 only - May 1 0:00 1:00 D
@@ -1466,12 +1524,12 @@
# From Yu-Cheng Chuang (2013-07-12):
# ...the Meiji Emperor announced Ordinance No. 167 of Meiji Year 28 "The clause
# about standard time" ... The adoption began from Jan 1, 1896.
-# http://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
+# https://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
#
# ...the Showa Emperor announced Ordinance No. 529 of Showa Year 12 ... which
# means the whole Japan territory, including later occupations, adopt Japan
# Central Time (UTC+9). The adoption began on Oct 1, 1937.
-# http://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
+# https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u
@@ -1533,7 +1591,7 @@
# Official, in Arabic:
# http://www.petra.gov.jo/public_news/Nws_NewsDetails.aspx?Menu_ID=&Site_Id=2&lang=1&NewsID=133230&CatID=14
# ... Our background/permalink about it
-# http://www.timeanddate.com/news/time/jordan-reverses-dst-decision.html
+# https://www.timeanddate.com/news/time/jordan-reverses-dst-decision.html
# ...
# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?lang=2&site_id=1&NewsID=133313&Type=P
# ... says midnight for the coming one and 1:00 for the ones in the future
@@ -1891,9 +1949,9 @@
# between 1987 and 1988 ...
# From Sanghyuk Jung (2014-10-29):
-# http://mm.icann.org/pipermail/tz/2014-October/021830.html
+# https://mm.icann.org/pipermail/tz/2014-October/021830.html
# According to the Korean Wikipedia
-# http://ko.wikipedia.org/wiki/한국_표준시
+# https://ko.wikipedia.org/wiki/한국_표준시
# [oldid=12896437 2014-09-04 08:03 UTC]
# DST in Republic of Korea was as follows.... And I checked old
# newspapers in Korean, all articles correspond with data in Wikipedia.
@@ -2115,7 +2173,7 @@
# +08:00 instead. Different sources appear to disagree with the tz
# database on this, e.g.:
#
-# http://www.timeanddate.com/worldclock/city.html?n=1026
+# https://www.timeanddate.com/worldclock/city.html?n=1026
# http://www.worldtimeserver.com/current_time_in_MN.aspx
#
# both say GMT+08:00.
@@ -2245,7 +2303,7 @@
# help reduce load shedding by approving the closure of commercial centres at
# 9pm and moving clocks forward by one hour for the next three months. ...."
#
-# http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html
+# http://www.worldtimezone.com/dst_news/dst_news_pakistan01.html
# http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4
# From Arthur David Olson (2008-05-19):
@@ -2311,7 +2369,7 @@
#
# We have confirmed this year's end date with both with the Ministry of
# Water and Power and the Pakistan Electric Power Company:
-# http://www.timeanddate.com/news/time/pakistan-ends-dst09.html
+# https://www.timeanddate.com/news/time/pakistan-ends-dst09.html
# From Christoph Göhre (2009-10-01):
# [T]he German Consulate General in Karachi reported me today that Pakistan
@@ -2493,7 +2551,7 @@
#
# We are not sure if Gaza will do the same, last year they had a different
# end date, we will keep this page updated:
-# http://www.timeanddate.com/news/time/westbank-gaza-dst-2009.html
+# https://www.timeanddate.com/news/time/westbank-gaza-dst-2009.html
# From Alexander Krivenyshev (2009-09-02):
# Seems that Gaza Strip will go back to Winter Time same date as West Bank.
@@ -2531,7 +2589,7 @@
# the clocks were set back one hour at 2010-08-11 00:00:00 local time in
# Gaza and the West Bank.
# Some more background info:
-# http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html
+# https://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html
# From Steffen Thorsen (2011-08-26):
# Gaza and the West Bank did go back to standard time in the beginning of
@@ -2541,7 +2599,7 @@
#
# http://www.maannews.net/eng/ViewDetails.aspx?ID=416217
# Additional info:
-# http://www.timeanddate.com/news/time/palestine-dst-2011.html
+# https://www.timeanddate.com/news/time/palestine-dst-2011.html
# From Alexander Krivenyshev (2011-08-27):
# According to the article in The Jerusalem Post:
@@ -2551,7 +2609,7 @@
# The Hamas government said on Saturday that it won't observe summertime after
# the Muslim feast of Id al-Fitr, which begins on Tuesday..."
# ...
-# http://www.jpost.com/MiddleEast/Article.aspx?id=235650
+# https://www.jpost.com/MiddleEast/Article.aspx?id=235650
# http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html
# The rules for Egypt are stolen from the 'africa' file.
@@ -2572,7 +2630,7 @@
# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html
#
# Our brief summary:
-# http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
+# https://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
# From Steffen Thorsen (2013-03-26):
# The following news sources tells that Palestine will "start daylight saving
@@ -2592,11 +2650,11 @@
# From Steffen Thorsen (2015-03-03):
# Sources such as http://www.alquds.com/news/article/view/id/548257
-# and http://www.raya.ps/ar/news/890705.html say Palestine areas will
+# and https://www.raya.ps/ar/news/890705.html say Palestine areas will
# start DST on 2015-03-28 00:00 which is one day later than expected.
#
# From Paul Eggert (2015-03-03):
-# http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
+# https://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
# says that the fall 2014 transition was Oct 23 at 24:00.
# From Hannah Kreitem (2016-03-09):
@@ -2620,8 +2678,8 @@
#
# From Paul Eggert (2016-10-19):
# It's also consistent with predictions in the following URLs today:
-# http://www.timeanddate.com/time/change/gaza-strip/gaza
-# http://www.timeanddate.com/time/change/west-bank/hebron
+# https://www.timeanddate.com/time/change/gaza-strip/gaza
+# https://www.timeanddate.com/time/change/west-bank/hebron
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
@@ -2684,7 +2742,7 @@
# Philippines, issued a proclamation announcing that 1844-12-30 was to
# be immediately followed by 1845-01-01; see R.H. van Gent's
# History of the International Date Line
-# http://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm
+# https://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm
# The rest of the data entries are from Shanks & Pottenger.
# From Jesper Nørgaard Welen (2006-04-26):
@@ -2948,7 +3006,7 @@
# We have not found any sources saying anything about when DST ends this year.
#
# Our summary
-# http://www.timeanddate.com/news/time/syria-dst-starts-march-27-2009.html
+# https://www.timeanddate.com/news/time/syria-dst-starts-march-27-2009.html
# From Steffen Thorsen (2009-10-27):
# The Syrian Arab News Network on 2009-09-29 reported that Syria will
@@ -2975,7 +3033,7 @@
# http://www.sana.sy/ara/2/2012/03/26/408215.htm
#
# Our brief summary:
-# http://www.timeanddate.com/news/time/syria-dst-2012.html
+# https://www.timeanddate.com/news/time/syria-dst-2012.html
# From Arthur David Olson (2012-03-27):
# Assume last Friday in March going forward XXX.
@@ -3058,7 +3116,7 @@
# is quoted verbatim in:
# http://www.thoigian.com.vn/?mPage=P80D01
# is translated by Brian Inglis in:
-# http://mm.icann.org/pipermail/tz/2014-October/021654.html
+# https://mm.icann.org/pipermail/tz/2014-October/021654.html
# and is the basis for the information below.
#
# The 1906 transition was effective July 1 and standardized Indochina to
--- a/test/jdk/sun/util/calendar/zi/tzdata/australasia Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/sun/util/calendar/zi/tzdata/australasia Mon Nov 13 13:18:35 2017 -0800
@@ -316,7 +316,7 @@
# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=1096:3310-cabinet-approves-change-in-daylight-savings-dates&catid=49:cabinet-releases&Itemid=166
#
# A bit more background info here:
-# http://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html
+# https://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html
# From Alexander Krivenyshev (2010-10-24):
# According to Radio Fiji and Fiji Times online, Fiji will end DST 3
@@ -380,9 +380,12 @@
# clocks go forward an hour at 2am to 3am.... Daylight Saving will
# end at 3.00am on Sunday 15th January 2017."
-# From Paul Eggert (2016-10-03):
-# For now, guess DST from 02:00 the first Sunday in November to
-# 03:00 the third Sunday in January. Although ad hoc, it matches
+# From Paul Eggert (2017-08-21):
+# Dominic Fok writes (2017-08-20) that DST ends 2018-01-14, citing
+# Extraordinary Government of Fiji Gazette Supplement No. 21 (2017-08-27),
+# [Legal Notice No. 41] of an order of the previous day by J Usamate.
+# For now, guess DST from 02:00 the first Sunday in November to 03:00
+# the first Sunday on or after January 14. Although ad hoc, it matches
# transitions since late 2014 and seems more likely to match future
# practice than guessing no DST.
@@ -396,7 +399,7 @@
Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 -
Rule Fiji 2014 only - Jan Sun>=18 2:00 0 -
Rule Fiji 2014 max - Nov Sun>=1 2:00 1:00 S
-Rule Fiji 2015 max - Jan Sun>=15 3:00 0 -
+Rule Fiji 2015 max - Jan Sun>=14 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
12:00 Fiji +12/+13
@@ -580,7 +583,7 @@
# The World War II entries below are instead based on Arawa-Kieta.
# The Japanese occupied Kieta in July 1942,
# according to the Pacific War Online Encyclopedia
-# http://pwencycl.kgbudge.com/B/o/Bougainville.htm
+# https://pwencycl.kgbudge.com/B/o/Bougainville.htm
# and seem to have controlled it until their 1945-08-21 surrender.
#
# The Autonomous Region of Bougainville switched from UT +10 to +11
@@ -602,7 +605,7 @@
-8:00 - -08
# American Samoa
-Zone Pacific/Pago_Pago 12:37:12 - LMT 1879 Jul 5
+Zone Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5
-11:22:48 - LMT 1911
-11:00 - SST # S=Samoa
Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
@@ -618,7 +621,7 @@
# Sunday of April 2011."
#
# Background info:
-# http://www.timeanddate.com/news/time/samoa-dst-plan-2009.html
+# https://www.timeanddate.com/news/time/samoa-dst-plan-2009.html
#
# Samoa's Daylight Saving Time Act 2009 is available here, but does not
# contain any dates:
@@ -682,7 +685,7 @@
Rule WS 2012 max - Apr Sun>=1 4:00 0 S
Rule WS 2012 max - Sep lastSun 3:00 1 D
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5
+Zone Pacific/Apia 12:33:04 - LMT 1892 Jul 5
-11:26:56 - LMT 1911
-11:30 - -1130 1950
-11:00 WS -11/-10 2011 Dec 29 24:00
@@ -709,7 +712,7 @@
# From Paul Eggert (2012-07-25)
# A Google Books snippet of Appendix to the Journals of the House of
# Representatives of New Zealand, Session 1948,
-# <http://books.google.com/books?id=ZaVCAQAAIAAJ>, page 65, says Tokelau
+# <https://books.google.com/books?id=ZaVCAQAAIAAJ>, page 65, says Tokelau
# was "11 hours slow on G.M.T." Go with Thorsen and assume Shanks & Pottenger
# are off by an hour starting in 1901.
@@ -724,8 +727,8 @@
Rule Tonga 2000 only - Mar 19 2:00s 0 -
Rule Tonga 2000 2001 - Nov Sun>=1 2:00 1:00 S
Rule Tonga 2001 2002 - Jan lastSun 2:00 0 -
-Rule Tonga 2016 max - Nov Sun>=1 2:00 1:00 S
-Rule Tonga 2017 max - Jan Sun>=15 3:00 0 -
+Rule Tonga 2016 only - Nov Sun>=1 2:00 1:00 S
+Rule Tonga 2017 only - Jan Sun>=15 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Tongatapu 12:19:20 - LMT 1901
12:20 - +1220 1941
@@ -779,7 +782,7 @@
# Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin,
# "The United States High-Altitude Test Experience: A Review Emphasizing the
# Impact on the Environment", Los Alamos LA-6405, Oct 1976.
-# http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf
+# https://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf
# See the table on page 4 where he lists GMT and local times for the tests; a
# footnote for the JI tests reads that local time is "JI time = Hawaii Time
# Minus One Hour".
@@ -845,7 +848,7 @@
#
# For data circa 1899, a common source is:
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
+# https://www.jstor.org/stable/1774359
#
# A reliable and entertaining source about time zones is
# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
@@ -992,7 +995,7 @@
# AEST ACST AWST AEDT ACDT
#
# Parliamentary Library (2008-11-10)
-# http://www.aph.gov.au/binaries/library/pubs/rp/2008-09/09rp14.pdf
+# https://www.aph.gov.au/binaries/library/pubs/rp/2008-09/09rp14.pdf
# EST CST WST preferred for standard time; AEST AEDT ACST ACDT also used
#
# The Transport Safety Bureau has an extensive series of accident reports,
@@ -1028,13 +1031,13 @@
#
# NSW (including LHI and Broken Hill):
# Standard Time Act 1987 (updated 1995-04-04)
-# http://www.austlii.edu.au/au/legis/nsw/consol_act/sta1987137/index.html
+# https://www.austlii.edu.au/au/legis/nsw/consol_act/sta1987137/index.html
# ACT
# Standard Time and Summer Time Act 1972
-# http://www.austlii.edu.au/au/legis/act/consol_act/stasta1972279/index.html
+# https://www.austlii.edu.au/au/legis/act/consol_act/stasta1972279/index.html
# SA
# Standard Time Act, 1898
-# http://www.austlii.edu.au/au/legis/sa/consol_act/sta1898137/index.html
+# https://www.austlii.edu.au/au/legis/sa/consol_act/sta1898137/index.html
# From David Grosz (2005-06-13):
# It was announced last week that Daylight Saving would be extended by
@@ -1329,7 +1332,7 @@
# http://abc.net.au/news/regionals/neweng/monthly/regeng-22jul1999-1.htm
# (1999-07-22). For now, we'll wait to see if this really happens.
#
-# Victoria will following NSW. See:
+# Victoria will follow NSW. See:
# Vic to extend daylight saving (1999-07-28)
# http://abc.net.au/local/news/olympics/1999/07/item19990728112314_1.htm
#
@@ -1432,7 +1435,7 @@
# the ACT for all 52 weeks of the year...
#
# We have a wrap-up here:
-# http://www.timeanddate.com/news/time/south-australia-extends-dst.html
+# https://www.timeanddate.com/news/time/south-australia-extends-dst.html
###############################################################################
# New Zealand
@@ -1486,7 +1489,7 @@
# From Paul Eggert (2014-07-14):
# Chatham Island time was formally standardized on 1957-01-01 by
# New Zealand's Standard Time Amendment Act 1956 (1956-10-26).
-# http://www.austlii.edu.au/nz/legis/hist_act/staa19561956n100244.pdf
+# https://www.austlii.edu.au/nz/legis/hist_act/staa19561956n100244.pdf
# According to Google Books snippet view, a speaker in the New Zealand
# parliamentary debates in 1956 said "Clause 78 makes provision for standard
# time in the Chatham Islands. The time there is 45 minutes in advance of New
@@ -1601,7 +1604,7 @@
# the Norfolk Island Museum and the Australian Bureau of Meteorology's
# Norfolk Island station, and found no record of Norfolk observing DST
# other than in 1974/5. See:
-# http://www.timeanddate.com/time/australia/norfolk-island.html
+# https://www.timeanddate.com/time/australia/norfolk-island.html
# Pitcairn
@@ -1629,11 +1632,13 @@
# (Western) Samoa and American Samoa
-# Howse writes (p 153, citing p 10 of the 1883-11-18 New York Herald)
-# that in 1879 the King of Samoa decided to change
+# Howse writes (p 153) that after the 1879 standardization on Antipodean
+# time by the British governor of Fiji, the King of Samoa decided to change
# "the date in his kingdom from the Antipodean to the American system,
# ordaining - by a masterpiece of diplomatic flattery - that
# the Fourth of July should be celebrated twice in that year."
+# This happened in 1892, according to the Evening News (Sydney) of 1892-07-20.
+# https://www.staff.science.uu.nl/~gent0113/idl/idl.htm
# Although Shanks & Pottenger says they both switched to UT -11:30
# in 1911, and to -11 in 1950. many earlier sources give -11
@@ -1644,6 +1649,7 @@
# day in 2011. Assume also that the Samoas follow the US and New
# Zealand's "ST"/"DT" style of daylight-saving abbreviations.
+
# Tonga
# From Paul Eggert (1996-01-22):
@@ -1738,6 +1744,15 @@
# Assume Tonga will observe DST from the first Sunday in November at 02:00
# through the third Sunday in January at 03:00, like Fiji, for now.
+# From David Wade (2017-10-18):
+# In August government was disolved by the King. The current prime minister
+# continued in office in care taker mode. It is easy to see that few
+# decisions will be made until elections 16th November.
+#
+# From Paul Eggert (2017-10-18):
+# For now, guess that DST is discontinued. That's what the IATA is guessing.
+
+
# Wake
# From Vernice Anderson, Personal Secretary to Philip Jessup,
@@ -1750,7 +1765,7 @@
# making calculation of time in Washington difficult if not almost
# impossible.
#
-# http://www.trumanlibrary.org/wake/meeting.htm
+# https://www.trumanlibrary.org/oralhist/andrsonv.htm
# From Paul Eggert (2003-03-23):
# We have no other report of DST in Wake Island, so omit this info for now.
@@ -1778,7 +1793,7 @@
# an international standard, there are some places on the high seas where the
# correct date is ambiguous.
-# From Wikipedia <http://en.wikipedia.org/wiki/Time_zone> (2005-08-31):
+# From Wikipedia <https://en.wikipedia.org/wiki/Time_zone> (2005-08-31):
# Before 1920, all ships kept local apparent time on the high seas by setting
# their clocks at night or at the morning sight so that, given the ship's
# speed and direction, it would be 12 o'clock when the Sun crossed the ship's
--- a/test/jdk/sun/util/calendar/zi/tzdata/backward Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/sun/util/calendar/zi/tzdata/backward Mon Nov 13 13:18:35 2017 -0800
@@ -84,7 +84,9 @@
Link America/Manaus Brazil/West
Link America/Halifax Canada/Atlantic
Link America/Winnipeg Canada/Central
-Link America/Regina Canada/East-Saskatchewan
+# This line is commented out, as the name exceeded the 14-character limit
+# and was an unused misnomer.
+#Link America/Regina Canada/East-Saskatchewan
Link America/Toronto Canada/Eastern
Link America/Edmonton Canada/Mountain
Link America/St_Johns Canada/Newfoundland
--- a/test/jdk/sun/util/calendar/zi/tzdata/europe Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/sun/util/calendar/zi/tzdata/europe Mon Nov 13 13:18:35 2017 -0800
@@ -60,14 +60,14 @@
# [PDF] (1914-03)
#
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
-# <http://www.jstor.org/stable/1774359>. He writes:
+# <https://www.jstor.org/stable/1774359>. He writes:
# "It is requested that corrections and additions to these tables
# may be sent to Mr. John Milne, Royal Geographical Society,
# Savile Row, London." Nowadays please email them to tz@iana.org.
#
# Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
# This Russian-language source was consulted by Vladimir Karpinsky; see
-# http://mm.icann.org/pipermail/tz/2014-August/021320.html
+# https://mm.icann.org/pipermail/tz/2014-August/021320.html
# The full Russian citation is:
# Бялокоз, Евгений Людвигович. Новый счет времени в течении суток
# введенный декретом Совета народных комиссаров для всей России с 1-го
@@ -210,7 +210,7 @@
# foundations of civilization throughout the world.
# -- "A Silent Toast to William Willett", Pictorial Weekly;
# republished in Finest Hour (Spring 2002) 1(114):26
-# http://www.winstonchurchill.org/images/finesthour/Vol.01%20No.114.pdf
+# https://www.winstonchurchill.org/publications/finest-hour/finest-hour-114/a-silent-toast-to-william-willett-by-winston-s-churchill
# From Paul Eggert (2015-08-08):
# The OED Supplement says that the English originally said "Daylight Saving"
@@ -248,8 +248,8 @@
# official designation; the reply of the 21st was that there wasn't
# but he couldn't think of anything better than the "Double British
# Summer Time" that the BBC had been using informally.
-# http://www.polyomino.org.uk/british-time/bbc-19410418.png
-# http://www.polyomino.org.uk/british-time/ho-19410421.png
+# https://www.polyomino.org.uk/british-time/bbc-19410418.png
+# https://www.polyomino.org.uk/british-time/ho-19410421.png
# From Sir Alexander Maxwell in the above-mentioned letter (1941-04-21):
# [N]o official designation has as far as I know been adopted for the time
@@ -266,13 +266,13 @@
# the history of summer time legislation in the United Kingdom.
# Since 1998 Joseph S. Myers has been updating
# and extending this list, which can be found in
-# http://www.polyomino.org.uk/british-time/
+# https://www.polyomino.org.uk/british-time/
# From Joseph S. Myers (1998-01-06):
#
# The legal time in the UK outside of summer time is definitely GMT, not UTC;
# see Lord Tanlaw's speech
-# http://www.publications.parliament.uk/pa/ld199798/ldhansrd/vo970611/text/70611-10.htm#70611-10_head0
+# https://www.publications.parliament.uk/pa/ld199798/ldhansrd/vo970611/text/70611-10.htm#70611-10_head0
# (Lords Hansard 11 June 1997 columns 964 to 976).
# From Paul Eggert (2006-03-22):
@@ -318,7 +318,7 @@
# Irish 'public feeling (was) outraged by forcing of English time on us'."
# -- Parsons M. Dublin lost its time zone - and 25 minutes - after 1916 Rising.
# Irish Times 2014-10-27.
-# http://www.irishtimes.com/news/politics/dublin-lost-its-time-zone-and-25-minutes-after-1916-rising-1.1977411
+# https://www.irishtimes.com/news/politics/dublin-lost-its-time-zone-and-25-minutes-after-1916-rising-1.1977411
# From Joseph S. Myers (2005-01-26):
# Irish laws are available online at <http://www.irishstatutebook.ie>.
@@ -371,6 +371,12 @@
# Justice (tel +353 1 678 9711) who confirmed to me that the correct name is
# "Irish Summer Time", abbreviated to "IST".
+# Michael Deckers (2017-06-01) gave the following URLs for Ireland's
+# Summer Time Act, 1925 and Summer Time Orders, 1926 and 1947:
+# http://www.irishstatutebook.ie/eli/1925/act/8/enacted/en/print.html
+# http://www.irishstatutebook.ie/eli/1926/sro/919/made/en/print.html
+# http://www.irishstatutebook.ie/eli/1947/sro/71/made/en/print.html
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
# Summer Time Act, 1916
Rule GB-Eire 1916 only - May 21 2:00s 1:00 BST
@@ -495,14 +501,14 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Dublin -0:25:00 - LMT 1880 Aug 2
- -0:25:21 - DMT 1916 May 21 2:00 # Dublin MT
+ -0:25:21 - DMT 1916 May 21 2:00s # Dublin MT
-0:25:21 1:00 IST 1916 Oct 1 2:00s
0:00 GB-Eire %s 1921 Dec 6 # independence
- 0:00 GB-Eire GMT/IST 1940 Feb 25 2:00
- 0:00 1:00 IST 1946 Oct 6 2:00
- 0:00 - GMT 1947 Mar 16 2:00
- 0:00 1:00 IST 1947 Nov 2 2:00
- 0:00 - GMT 1948 Apr 18 2:00
+ 0:00 GB-Eire GMT/IST 1940 Feb 25 2:00s
+ 0:00 1:00 IST 1946 Oct 6 2:00s
+ 0:00 - GMT 1947 Mar 16 2:00s
+ 0:00 1:00 IST 1947 Nov 2 2:00s
+ 0:00 - GMT 1948 Apr 18 2:00s
0:00 GB-Eire GMT/IST 1968 Oct 27
1:00 - IST 1971 Oct 31 2:00u
0:00 GB-Eire GMT/IST 1996
@@ -648,7 +654,7 @@
# Council of Ministers of the USSR from 1989-03-14 No. 227.
#
# I did not find full texts of these acts. For the 1989 one we have
-# title at http://base.garant.ru/70754136/ :
+# title at https://base.garant.ru/70754136/ :
# "About change in calculation of time on the territories of
# Lithuanian SSR, Latvian SSR and Estonian SSR, Astrakhan,
# Kaliningrad, Kirov, Kuybyshev, Ulyanovsk and Uralsk oblasts".
@@ -679,7 +685,7 @@
# http://bmockbe.ru/events/?ID=7583
#
# Medvedev signed a law on the calculation of the time (in russian):
-# http://www.regnum.ru/news/polit/1413906.html
+# https://www.regnum.ru/news/polit/1413906.html
# From Arthur David Olson (2011-06-15):
# Take "abolishing daylight saving time" to mean that time is now considered
@@ -806,7 +812,7 @@
# Sources (Russian language):
# http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
# http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
-# http://news.tut.by/society/250578.html
+# https://news.tut.by/society/250578.html
#
# From Alexander Bokovoy (2014-10-09):
# Belarussian government decided against changing to winter time....
@@ -1127,7 +1133,7 @@
# for their standard and summer times. He says no, they use "suveaeg"
# (summer time) and "talveaeg" (winter time).
-# From The Baltic Times <http://www.baltictimes.com/> (1999-09-09)
+# From The Baltic Times <https://www.baltictimes.com/> (1999-09-09)
# via Steffen Thorsen:
# This year will mark the last time Estonia shifts to summer time,
# a council of the ruling coalition announced Sept. 6....
@@ -1179,7 +1185,7 @@
# This is documented in Heikki Oja: Aikakirja 2007, published by The Almanac
# Office of University of Helsinki, ISBN 952-10-3221-9, available online (in
# Finnish) at
-# http://almanakka.helsinki.fi/aikakirja/Aikakirja2007kokonaan.pdf
+# https://almanakka.helsinki.fi/aikakirja/Aikakirja2007kokonaan.pdf
#
# Page 105 (56 in PDF version) has a handy table of all past daylight savings
# transitions. It is easy enough to interpret without Finnish skills.
@@ -1192,7 +1198,7 @@
# From Konstantin Hyppönen (2014-06-13):
# [Heikki Oja's book Aikakirja 2013]
-# http://almanakka.helsinki.fi/images/aikakirja/Aikakirja2013kokonaan.pdf
+# https://almanakka.helsinki.fi/images/aikakirja/Aikakirja2013kokonaan.pdf
# pages 104-105, including a scan from a newspaper published on Apr 2 1942
# say that ... [o]n Apr 2 1942, 24 o'clock (which means Apr 3 1942,
# 00:00), clocks were moved one hour forward. The newspaper
@@ -1322,7 +1328,7 @@
# From Jörg Schilling (2002-10-23):
# In 1945, Berlin was switched to Moscow Summer time (GMT+4) by
-# http://www.dhm.de/lemo/html/biografien/BersarinNikolai/
+# https://www.dhm.de/lemo/html/biografien/BersarinNikolai/
# General [Nikolai] Bersarin.
# From Paul Eggert (2003-03-08):
@@ -1547,7 +1553,7 @@
# From Paul Eggert (2016-10-27):
# Go with INRiM for DST rules, except as corrected by Inglis for 1944
# for the Kingdom of Italy. This is consistent with Renzo Baldini.
-# Model Rome's occupation by using using C-Eur rules from 1943-09-10
+# Model Rome's occupation by using C-Eur rules from 1943-09-10
# to 1944-06-04; although Rome was an open city during this period, it
# was effectively controlled by Germany.
#
@@ -1862,14 +1868,14 @@
# Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)-
# Tiraspol will go back to winter time on October 30, 2011.
# News from Moldova (in russian):
-# http://ru.publika.md/link_317061.html
+# https://ru.publika.md/link_317061.html
# From Roman Tudos (2015-07-02):
# http://lex.justice.md/index.php?action=view&view=doc&lang=1&id=355077
# From Paul Eggert (2015-07-01):
# The abovementioned official link to IGO1445-868/2014 states that
# 2014-10-26's fallback transition occurred at 03:00 local time. Also,
-# http://www.trm.md/en/social/la-30-martie-vom-trece-la-ora-de-vara
+# https://www.trm.md/en/social/la-30-martie-vom-trece-la-ora-de-vara
# says the 2014-03-30 spring-forward transition was at 02:00 local time.
# Guess that since 1997 Moldova has switched one hour before the EU.
@@ -1941,7 +1947,7 @@
# Amsterdam mean time.
# The data entries before 1945 are taken from
-# http://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
+# https://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Neth 1916 only - May 1 0:00 1:00 NST # Netherlands Summer Time
@@ -2022,7 +2028,7 @@
# so it must have diverged from Oslo time during the war, as Oslo was
# keeping Berlin time.
#
-# <http://home.no.net/janmayen/history.htm> says that the meteorologists
+# <https://www.jan-mayen.no/history.htm> says that the meteorologists
# burned down their station in 1940 and left the island, but returned in
# 1941 with a small Norwegian garrison and continued operations despite
# frequent air attacks from Germans. In 1943 the Americans established a
@@ -2060,7 +2066,7 @@
Rule Poland 1945 only - Nov 1 0:00 0 -
# For 1946 on the source is Kazimierz Borkowski,
# Toruń Center for Astronomy, Dept. of Radio Astronomy, Nicolaus Copernicus U.,
-# http://www.astro.uni.torun.pl/~kb/Artykuly/U-PA/Czas2.htm#tth_tAb1
+# https://www.astro.uni.torun.pl/~kb/Artykuly/U-PA/Czas2.htm#tth_tAb1
# Thanks to Przemysław Augustyniak (2005-05-28) for this reference.
# He also gives these further references:
# Mon Pol nr 13, poz 162 (1995) <http://www.abc.com.pl/serwis/mp/1995/0162.htm>
@@ -2094,7 +2100,7 @@
#
# From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
# According to a Portuguese decree (1911-05-26)
-# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
+# https://dre.pt/application/dir/pdf1sdip/1911/05/12500/23132313.pdf
# Lisbon was at -0:36:44.68, but switched to GMT on 1912-01-01 at 00:00.
# Round the old offset to -0:36:45. This agrees with Willett but disagrees
# with Shanks, who says the transition occurred on 1911-05-24 at 00:00 for
@@ -2276,7 +2282,7 @@
# 2011 No. 725" and contains no other dates or "effective date" information.
#
# Another source is
-# http://www.rg.ru/2011/09/06/chas-zona-dok.html
+# https://rg.ru/2011/09/06/chas-zona-dok.html
# which, according to translate.google.com, begins "Resolution of the
# Government of the Russian Federation on August 31, 2011 N 725" and also
# contains "Date first official publication: September 6, 2011 Posted on:
@@ -2284,7 +2290,7 @@
# does not contain any "effective date" information.
#
# Another source is
-# http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7
+# https://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7
# which, in note 8, contains "Resolution No. 725 of August 31, 2011...
# Effective as of after 7 days following the day of the official publication"
# but which does not contain any reference to September 6, 2011.
@@ -2320,7 +2326,7 @@
# http://itar-tass.com/obschestvo/1333711
# http://www.pravo.gov.ru:8080/page.aspx?111660
# http://www.kremlin.ru/acts/46279
-# From October 26, 2014 the new Russian time zone map will looks like this:
+# From October 26, 2014 the new Russian time zone map will look like this:
# http://www.worldtimezone.com/dst_news/dst_news_russia-map-2014-07.html
# From Paul Eggert (2006-03-22):
@@ -2367,7 +2373,7 @@
# with maintenance only and represent our best guesses as to which regions
# are covered by each zone. They are not meant to be taken as an authoritative
# listing. The region codes listed come from
-# http://en.wikipedia.org/w/?title=Federal_subjects_of_Russia&oldid=611810498
+# https://en.wikipedia.org/w/?title=Federal_subjects_of_Russia&oldid=611810498
# and are used for convenience only; no guarantees are made regarding their
# future stability. ISO 3166-2:RU codes are also listed for first-level
# divisions where available.
@@ -2532,7 +2538,7 @@
# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
# says that Kaliningrad decided not to be an exception 2 days before the
# 1991-03-31 switch and one person at
-# http://izhevsk.ru/forum_light_message/50/682597-m8369040.html
+# https://izhevsk.ru/forum_light_message/50/682597-m8369040.html
# says he remembers that Samara opted out of the 1992-01-19 exception
# 2 days before the switch.
#
@@ -2604,7 +2610,7 @@
3:00 - MSK 1997 Mar lastSun 1:00u
# From Alexander Krivenyshev (2014-03-17):
# time change at 2:00 (2am) on March 30, 2014
-# http://vz.ru/news/2014/3/17/677464.html
+# https://vz.ru/news/2014/3/17/677464.html
# From Paul Eggert (2014-03-30):
# Simferopol and Sevastopol reportedly changed their central town clocks
# late the previous day, but this appears to have been ceremonial
@@ -2787,7 +2793,7 @@
# suggests that Altai Republic transitioned to Moscow+3 on
# 1995-05-28.
#
-# http://regnum.ru/news/society/1957270.html
+# https://regnum.ru/news/society/1957270.html
# has some historical data for Altai Krai:
# before 1957: west part on UTC+6, east on UTC+7
# after 1957: UTC+7
@@ -3161,8 +3167,8 @@
# districts, but have very similar populations. In fact, Wikipedia currently
# lists them both as having 3528 people, exactly 1668 males and 1860 females
# each! (Yikes!)
-# http://en.wikipedia.org/w/?title=Srednekolymsky_District&oldid=603435276
-# http://en.wikipedia.org/w/?title=Verkhnekolymsky_District&oldid=594378493
+# https://en.wikipedia.org/w/?title=Srednekolymsky_District&oldid=603435276
+# https://en.wikipedia.org/w/?title=Verkhnekolymsky_District&oldid=594378493
# Assume this is a mistake, albeit an amusing one.
#
# Looking at censuses, the populations of the two municipalities seem to have
@@ -3483,7 +3489,7 @@
#
# From Alois Treindl (2013-09-11):
# The Federal regulations say
-# http://www.admin.ch/opc/de/classified-compilation/20071096/index.html
+# https://www.admin.ch/opc/de/classified-compilation/20071096/index.html
# ... the meridian for Bern mean time ... is 7 degrees 26' 22.50".
# Expressed in time, it is 0h29m45.5s.
@@ -3560,9 +3566,9 @@
# According to the articles linked below, Turkey will change into summer
# time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27.
# This change is due to a nationwide exam on 27th.
-# http://www.worldbulletin.net/?aType=haber&ArticleID=70872
+# https://www.worldbulletin.net/?aType=haber&ArticleID=70872
# Turkish:
-# http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373
+# https://www.hurriyet.com.tr/yaz-saati-uygulamasi-bir-gun-ileri-alindi-17230464
# From Faruk Pasin (2014-02-14):
# The DST for Turkey has been changed for this year because of the
@@ -3698,7 +3704,7 @@
# http://www.segodnya.ua/news/14290482.html
#
# Deputies cancelled the winter time (in Russian)
-# http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
+# https://www.pravda.com.ua/rus/news/2011/09/20/6600616/
#
# From Philip Pizzey (2011-10-18):
# Today my Ukrainian colleagues have informed me that the
--- a/test/jdk/sun/util/calendar/zi/tzdata/leapseconds Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/sun/util/calendar/zi/tzdata/leapseconds Mon Nov 13 13:18:35 2017 -0800
@@ -26,19 +26,18 @@
# This file is in the public domain.
# This file is generated automatically from the data in the public-domain
-# leap-seconds.list file available from most NIST time servers.
-# If the URL <ftp://time.nist.gov/pub/leap-seconds.list> does not work,
-# you should be able to pick up leap-seconds.list from a secondary NIST server.
-# See <http://tf.nist.gov/tf-cgi/servers.cgi> for a list of secondary servers.
+# leap-seconds.list file, which is copied from:
+# ftp://ftp.nist.gov/pub/time/leap-seconds.list
# For more about leap-seconds.list, please see
# The NTP Timescale and Leap Seconds
-# http://www.eecis.udel.edu/~mills/leap.html
+# https://www.eecis.udel.edu/~mills/leap.html
# The International Earth Rotation and Reference Systems Service
# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
# (which measures the true angular orientation of the earth in space); see
-# Terry J Quinn, The BIPM and the accurate measure of time,
-# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>.
+# Levine J. Coordinated Universal Time and the leap second.
+# URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995
+# http://ieeexplore.ieee.org/document/7909995/
# There were no leap seconds before 1972, because the official mechanism
# accounting for the discrepancy between atomic time and the earth's rotation
# did not exist until the early 1970s.
@@ -81,5 +80,5 @@
Leap 2015 Jun 30 23:59:60 + S
Leap 2016 Dec 31 23:59:60 + S
-# Updated through IERS Bulletin C53
-# File expires on: 28 December 2017
+# Updated through IERS Bulletin C54
+# File expires on: 28 June 2018
--- a/test/jdk/sun/util/calendar/zi/tzdata/northamerica Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/sun/util/calendar/zi/tzdata/northamerica Mon Nov 13 13:18:35 2017 -0800
@@ -128,10 +128,13 @@
# Last night I heard part of a rebroadcast of a 1945 Arch Oboler radio drama.
# In the introduction, Oboler spoke of "Eastern Peace Time."
# An AltaVista search turned up:
-# http://rowayton.org/rhs/hstaug45.html
+# https://web.archive.org/web/20000926032210/http://rowayton.org/rhs/hstaug45.html
# "When the time is announced over the radio now, it is 'Eastern Peace
# Time' instead of the old familiar 'Eastern War Time.' Peace is wonderful."
# (August 1945) by way of confirmation.
+#
+# From Paul Eggert (2017-09-23):
+# This was the V-J Day issue of the Clamdigger, a Rowayton, CT newsletter.
# From Joseph Gallant citing
# George H. Douglas, _The Early Days of Radio Broadcasting_ (1987):
@@ -280,7 +283,7 @@
# HST and HDT are standardized abbreviations for Hawaii-Aleutian
# standard and daylight times. See section 9.47 (p 234) of the
# U.S. Government Printing Office Style Manual (2008)
-# http://www.gpo.gov/fdsys/pkg/GPO-STYLEMANUAL-2008/pdf/GPO-STYLEMANUAL-2008.pdf
+# https://www.gpo.gov/fdsys/pkg/GPO-STYLEMANUAL-2008/pdf/GPO-STYLEMANUAL-2008.pdf
# From Arthur David Olson, 2005-08-09
# The following was signed into law on 2005-08-08.
@@ -369,7 +372,7 @@
# western Tennessee, most of Texas, Wisconsin
# From Larry M. Smith (2006-04-26) re Wisconsin:
-# http://www.legis.state.wi.us/statutes/Stat0175.pdf ...
+# https://docs.legis.wisconsin.gov/statutes/statutes/175.pdf
# is currently enforced at the 01:00 time of change. Because the local
# "bar time" in the state corresponds to 02:00, a number of citations
# are issued for the "sale of class 'B' alcohol after prohibited
@@ -378,7 +381,7 @@
# From Douglas R. Bomberg (2007-03-12):
# Wisconsin has enacted (nearly eleventh-hour) legislation to get WI
# Statue 175 closer in synch with the US Congress' intent....
-# http://www.legis.state.wi.us/2007/data/acts/07Act3.pdf
+# https://docs.legis.wisconsin.gov/2007/related/acts/3
# From an email administrator of the City of Fort Pierre, SD (2015-12-21):
# Fort Pierre is technically located in the Mountain time zone as is
@@ -425,7 +428,7 @@
# ...it appears that Mercer County, North Dakota, changed from the
# mountain time zone to the central time zone at the last transition from
# daylight-saving to standard time (on Nov. 7, 2010):
-# http://www.gpo.gov/fdsys/pkg/FR-2010-09-29/html/2010-24376.htm
+# https://www.gpo.gov/fdsys/pkg/FR-2010-09-29/html/2010-24376.htm
# http://www.bismarcktribune.com/news/local/article_1eb1b588-c758-11df-b472-001cc4c03286.html
# From Andy Lipscomb (2011-01-24):
@@ -476,7 +479,7 @@
# legal time, and is not part of the data here.) See:
# Ross SA. An energy crisis from the past: Northern California in 1948.
# Working Paper No. 8, Institute of Governmental Studies, UC Berkeley,
-# 1973-11. http://escholarship.org/uc/item/8x22k30c
+# 1973-11. https://escholarship.org/uc/item/8x22k30c
#
# In another measure to save electricity, DST was instituted from 1948-03-14
# at 02:01 to 1949-01-16 at 02:00, with the governor having the option to move
@@ -497,8 +500,8 @@
# which established DST from April's last Sunday at 01:00 until September's
# last Sunday at 02:00. This was amended by 1962's Proposition 6, which changed
# the fall-back date to October's last Sunday. See:
-# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&context=ca_ballot_props
-# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&context=ca_ballot_props
+# https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&context=ca_ballot_props
+# https://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&context=ca_ballot_props
#
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule CA 1948 only - Mar 14 2:01 1:00 D
@@ -515,20 +518,31 @@
# Alaska
# AK%sT is the modern abbreviation for -09 per USNO.
#
-# From Paul Eggert (2001-05-30):
+# From Paul Eggert (2017-06-15):
# Howse writes that Alaska switched from the Julian to the Gregorian calendar,
# and from east-of-GMT to west-of-GMT days, when the US bought it from Russia.
-# This was on 1867-10-18, a Friday; the previous day was 1867-10-06 Julian,
-# also a Friday. Include only the time zone part of this transition,
-# ignoring the switch from Julian to Gregorian, since we can't represent
-# the Julian calendar.
+# On Friday, 1867-10-18 (Gregorian), at precisely 15:30 local time, the
+# Russian forts and fleet at Sitka fired salutes to mark the ceremony of
+# formal transfer. See the Sacramento Daily Union (1867-11-14), p 3, col 2.
+# https://cdnc.ucr.edu/cgi-bin/cdnc?a=d&d=SDU18671114.2.12.1
+# Sitka workers did not change their calendars until Sunday, 1867-10-20,
+# and so celebrated two Sundays that week. See: Ahllund T (tr Hallamaa P).
+# From the memoirs of a Finnish workman. Alaska History. 2006 Fall;21(2):1-25.
+# http://alaskahistoricalsociety.org/wp-content/uploads/2016/12/Ahllund-2006-Memoirs-of-a-Finnish-Workman.pdf
+# Include only the time zone part of this transition, ignoring the switch
+# from Julian to Gregorian, since we can't represent the Julian calendar.
#
-# As far as we know, none of the exact locations mentioned below were
+# As far as we know, of the locations mentioned below only Sitka was
# permanently inhabited in 1867 by anyone using either calendar.
-# (Yakutat was colonized by the Russians in 1799, but the settlement
-# was destroyed in 1805 by a Yakutat-kon war party.) However, there
-# were nearby inhabitants in some cases and for our purposes perhaps
-# it's best to simply use the official transition.
+# (Yakutat was colonized by the Russians in 1799, but the settlement was
+# destroyed in 1805 by a Yakutat-kon war party.) Many of Alaska's inhabitants
+# were unaware of the US acquisition of Alaska, much less of any calendar or
+# time change. However, the Russian-influenced part of Alaska did observe
+# Russian time, and it is more accurate to model this than to ignore it.
+# The database format requires an exact transition time; use the Russian
+# salute as a somewhat-arbitrary time for the formal transfer of control for
+# all of Alaska. Sitka's UTC offset is -9:01:13; adjust its 15:30 to the
+# local times of other Alaskan locations so that they change simultaneously.
# From Paul Eggert (2014-07-18):
# One opinion of the early-1980s turmoil in Alaska over time zones and
@@ -581,10 +595,10 @@
# It seems Metlakatla did go off PST on Sunday, November 1, changing
# their time to AKST and are going to follow Alaska's DST, switching
# between AKST and AKDT from now on....
-# http://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
+# https://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone America/Juneau 15:02:19 - LMT 1867 Oct 18
+Zone America/Juneau 15:02:19 - LMT 1867 Oct 19 15:33:32
-8:57:41 - LMT 1900 Aug 20 12:00
-8:00 - PST 1942
-8:00 US P%sT 1946
@@ -594,7 +608,7 @@
-8:00 US P%sT 1983 Oct 30 2:00
-9:00 US Y%sT 1983 Nov 30
-9:00 US AK%sT
-Zone America/Sitka 14:58:47 - LMT 1867 Oct 18
+Zone America/Sitka 14:58:47 - LMT 1867 Oct 19 15:30
-9:01:13 - LMT 1900 Aug 20 12:00
-8:00 - PST 1942
-8:00 US P%sT 1946
@@ -602,7 +616,7 @@
-8:00 US P%sT 1983 Oct 30 2:00
-9:00 US Y%sT 1983 Nov 30
-9:00 US AK%sT
-Zone America/Metlakatla 15:13:42 - LMT 1867 Oct 18
+Zone America/Metlakatla 15:13:42 - LMT 1867 Oct 19 15:44:55
-8:46:18 - LMT 1900 Aug 20 12:00
-8:00 - PST 1942
-8:00 US P%sT 1946
@@ -610,14 +624,14 @@
-8:00 US P%sT 1983 Oct 30 2:00
-8:00 - PST 2015 Nov 1 2:00
-9:00 US AK%sT
-Zone America/Yakutat 14:41:05 - LMT 1867 Oct 18
+Zone America/Yakutat 14:41:05 - LMT 1867 Oct 19 15:12:18
-9:18:55 - LMT 1900 Aug 20 12:00
-9:00 - YST 1942
-9:00 US Y%sT 1946
-9:00 - YST 1969
-9:00 US Y%sT 1983 Nov 30
-9:00 US AK%sT
-Zone America/Anchorage 14:00:24 - LMT 1867 Oct 18
+Zone America/Anchorage 14:00:24 - LMT 1867 Oct 19 14:31:37
-9:59:36 - LMT 1900 Aug 20 12:00
-10:00 - AST 1942
-10:00 US A%sT 1967 Apr
@@ -625,7 +639,7 @@
-10:00 US AH%sT 1983 Oct 30 2:00
-9:00 US Y%sT 1983 Nov 30
-9:00 US AK%sT
-Zone America/Nome 12:58:21 - LMT 1867 Oct 18
+Zone America/Nome 12:58:22 - LMT 1867 Oct 19 13:29:35
-11:01:38 - LMT 1900 Aug 20 12:00
-11:00 - NST 1942
-11:00 US N%sT 1946
@@ -634,7 +648,7 @@
-11:00 US B%sT 1983 Oct 30 2:00
-9:00 US Y%sT 1983 Nov 30
-9:00 US AK%sT
-Zone America/Adak 12:13:21 - LMT 1867 Oct 18
+Zone America/Adak 12:13:22 - LMT 1867 Oct 19 12:44:35
-11:46:38 - LMT 1900 Aug 20 12:00
-11:00 - NST 1942
-11:00 US N%sT 1946
@@ -670,7 +684,7 @@
# "Hawaiian Time" by Robert C. Schmitt and Doak C. Cox appears on pages 207-225
# of volume 26 of The Hawaiian Journal of History (1992). As of 2010-12-09,
# the article is available at
-# http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf
+# https://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf
# and indicates that standard time was adopted effective noon, January
# 13, 1896 (page 218), that in "1933, the Legislature decreed daylight
# saving for the period between the last Sunday of each April and the
@@ -769,7 +783,7 @@
# Indiana
#
# For a map of Indiana's time zone regions, see:
-# http://en.wikipedia.org/wiki/Time_in_Indiana
+# https://en.wikipedia.org/wiki/Time_in_Indiana
#
# From Paul Eggert (2007-08-17):
# Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
@@ -996,7 +1010,7 @@
# From Paul Eggert (2001-07-16):
# The final rule was published in the
# Federal Register 65, 160 (2000-08-17), pp 50154-50158.
-# http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=2000_register&docid=fr17au00-22
+# https://www.gpo.gov/fdsys/pkg/FR-2000-08-17/html/00-20854.htm
#
Zone America/Kentucky/Monticello -5:39:24 - LMT 1883 Nov 18 12:20:36
-6:00 US C%sT 1946
@@ -1022,7 +1036,7 @@
# West Wendover, NV officially switched from Pacific to mountain time on
# 1999-10-31. See the
# Federal Register 64, 203 (1999-10-21), pp 56705-56707.
-# http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=1999_register&docid=fr21oc99-15
+# https://www.gpo.gov/fdsys/pkg/FR-1999-10-21/html/99-27240.htm
# However, the Federal Register says that West Wendover already operated
# on mountain time, and the rule merely made this official;
# hence a separate tz entry is not needed.
@@ -1052,12 +1066,23 @@
# one hour in 1914." This change is not in Shanks. We have no more
# info, so omit this for now.
#
+# From Paul Eggert (2017-07-26):
+# Although Shanks says Detroit observed DST in 1967 from 06-14 00:01
+# until 10-29 00:01, I now see multiple reports that this is incorrect.
+# For example, according to a 50-year anniversary report about the 1967
+# Detroit riots and a major-league doubleheader on 1967-07-23, "By the time
+# the last fly ball of the doubleheader settled into the glove of leftfielder
+# Lenny Green, it was after 7 p.m. Detroit did not observe daylight saving
+# time, so light was already starting to fail. Twilight was made even deeper
+# by billowing columns of smoke that ascended in an unbroken wall north of the
+# ballpark." See: Dow B. Detroit '67: As violence unfolded, Tigers played two
+# at home vs. Yankees. Detroit Free Press 2017-07-23.
+# https://www.freep.com/story/sports/mlb/tigers/2017/07/23/detroit-tigers-1967-riot-new-york-yankees/499951001/
+#
# Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule Detroit 1948 only - Apr lastSun 2:00 1:00 D
Rule Detroit 1948 only - Sep lastSun 2:00 0 S
-Rule Detroit 1967 only - Jun 14 2:00 1:00 D
-Rule Detroit 1967 only - Oct lastSun 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Detroit -5:32:11 - LMT 1905
-6:00 - CST 1915 May 15 2:00
@@ -1121,7 +1146,7 @@
# [PDF] (1914-03)
#
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
-# <http://www.jstor.org/stable/1774359>.
+# <https://www.jstor.org/stable/1774359>.
#
# See the 'europe' file for Greenland.
@@ -1167,19 +1192,19 @@
# The British Columbia government announced yesterday that it will
# adjust daylight savings next year to align with changes in the
# U.S. and the rest of Canada....
-# http://www2.news.gov.bc.ca/news_releases_2005-2009/2006AG0014-000330.htm
+# https://archive.news.gov.bc.ca/releases/news_releases_2005-2009/2006AG0014-000330.htm
# ...
# Nova Scotia
# Daylight saving time will be extended by four weeks starting in 2007....
-# http://www.gov.ns.ca/just/regulations/rg2/2006/ma1206.pdf
+# https://www.novascotia.ca/just/regulations/rg2/2006/ma1206.pdf
#
# [For New Brunswick] the new legislation dictates that the time change is to
# be done at 02:00 instead of 00:01.
-# http://www.gnb.ca/0062/acts/BBA-2006/Chap-19.pdf
+# https://www.gnb.ca/0062/acts/BBA-2006/Chap-19.pdf
# ...
# Manitoba has traditionally changed the clock every fall at 03:00.
# As of 2006, the transition is to take place one hour earlier at 02:00.
-# http://web2.gov.mb.ca/laws/statutes/ccsm/o030e.php
+# https://web2.gov.mb.ca/laws/statutes/ccsm/o030e.php
# ...
# [Alberta, Ontario, Quebec] will follow US rules.
# http://www.qp.gov.ab.ca/documents/spring/CH03_06.CFM
@@ -1193,7 +1218,7 @@
# http://www.hoa.gov.nl.ca/hoa/bills/Bill0634.htm
# ...
# Yukon
-# http://www.gov.yk.ca/legislation/regs/oic2006_127.pdf
+# https://www.gov.yk.ca/legislation/regs/oic2006_127.pdf
# ...
# N.W.T. will follow US rules. Whoever maintains the government web site
# does not seem to believe in bookmarks. To see the news release, click the
@@ -1214,8 +1239,8 @@
# time and daylight saving time arrangements in Canada circa 1998.
#
# National Research Council Canada maintains info about time zones and DST.
-# http://www.nrc-cnrc.gc.ca/eng/services/time/time_zones.html
-# http://www.nrc-cnrc.gc.ca/eng/services/time/faq/index.html#Q5
+# https://www.nrc-cnrc.gc.ca/eng/services/time/time_zones.html
+# https://www.nrc-cnrc.gc.ca/eng/services/time/faq/index.html#Q5
# Its unofficial information is often taken from Matthews and Vincent.
# From Paul Eggert (2006-06-27):
@@ -1252,11 +1277,13 @@
# Newfoundland and Labrador
-# From Paul Eggert (2000-10-02):
-# Matthews and Vincent (1998) write that Labrador should use NST/NDT,
-# but the only part of Labrador that follows the rules is the
-# southeast corner, including Port Hope Simpson and Mary's Harbour,
-# but excluding, say, Black Tickle.
+# From Paul Eggert (2017-10-14):
+# Legally Labrador should observe Newfoundland time; see:
+# McLeod J. Labrador time - legal or not? St. John's Telegram, 2017-10-07
+# http://www.thetelegram.com/news/local/labrador-time--legal-or-not-154860/
+# Matthews and Vincent (1998) write that the only part of Labrador
+# that follows the rules is the southeast corner, including Port Hope
+# Simpson and Mary's Harbour, but excluding, say, Black Tickle.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule StJohns 1917 only - Apr 8 2:00 1:00 D
@@ -1456,7 +1483,7 @@
# http://www.justice.gouv.qc.ca/english/publications/generale/temps-minganie-a.htm
# that the coastal strip from just east of Natashquan to Blanc-Sablon
# observes Atlantic standard time all year round.
-# http://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en
+# https://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en
# says this common practice was codified into law as of 2007.
# For lack of better info, guess this practice began around 1970, contra to
# Shanks & Pottenger who have this region observing AST/ADT.
@@ -1488,6 +1515,11 @@
# earlier in June).
#
# Kenora, Ontario, was to abandon DST on 1914-06-01 (-05-21).
+#
+# From Paul Eggert (2017-07-08):
+# For more on Orillia, see: Daubs K. Bold attempt at daylight saving
+# time became a comic failure in Orillia. Toronto Star 2017-07-08.
+# https://www.thestar.com/news/insight/2017/07/08/bold-attempt-at-daylight-saving-time-became-a-comic-failure-in-orillia.html
# From Paul Eggert (1997-10-17):
# Mark Brader writes that an article in the 1997-10-14 Toronto Star
@@ -1979,7 +2011,7 @@
# * 1967. Paragraph 28(34)(g) of the Interpretation Act, S.C. 1967-68,
# c. 7 defines Yukon standard time as UTC-9....
# see Interpretation Act, R.S.C. 1985, c. I-21, s. 35(1).
-# [http://canlii.ca/t/7vhg]
+# [https://www.canlii.org/en/ca/laws/stat/rsc-1985-c-i-21/latest/rsc-1985-c-i-21.html]
# * C.O. 1973/214 switched Yukon to PST on 1973-10-28 00:00.
# * O.I.C. 1980/02 established DST.
# * O.I.C. 1987/056 changed DST to Apr firstSun 2:00 to Oct lastSun 2:00.
@@ -2044,7 +2076,7 @@
# hours behind Greenwich Time.
#
# * Yukon Standard Time defined as Pacific Standard Time, YCO 1973/214
-# http://www.canlii.org/en/yk/laws/regu/yco-1973-214/latest/yco-1973-214.html
+# https://www.canlii.org/en/yk/laws/regu/yco-1973-214/latest/yco-1973-214.html
# C.O. 1973/214 INTERPRETATION ACT ...
#
# 1. Effective October 28, 1973 Commissioner's Order 1967/59 is hereby
@@ -2059,7 +2091,7 @@
# http://? - no online source found
#
# * Yukon Daylight Saving Time, YOIC 1987/56
-# http://www.canlii.org/en/yk/laws/regu/yoic-1987-56/latest/yoic-1987-56.html
+# https://www.canlii.org/en/yk/laws/regu/yoic-1987-56/latest/yoic-1987-56.html
# O.I.C. 1987/056 INTERPRETATION ACT ...
#
# In every year between
@@ -2071,7 +2103,7 @@
# Dated ... 9th day of March, A.D., 1987.
#
# * Yukon Daylight Saving Time 2006, YOIC 2006/127
-# http://www.canlii.org/en/yk/laws/regu/yoic-2006-127/latest/yoic-2006-127.html
+# https://www.canlii.org/en/yk/laws/regu/yoic-2006-127/latest/yoic-2006-127.html
# O.I.C. 2006/127 INTERPRETATION ACT ...
#
# 1. In Yukon each year the time for general purposes shall be 7 hours
@@ -2085,7 +2117,7 @@
# 3. This order comes into force January 1, 2007.
#
# * Interpretation Act, RSY 2002, c 125
-# http://www.canlii.org/en/yk/laws/stat/rsy-2002-c-125/latest/rsy-2002-c-125.html
+# https://www.canlii.org/en/yk/laws/stat/rsy-2002-c-125/latest/rsy-2002-c-125.html
# From Rives McDow (1999-09-04):
# Nunavut ... moved ... to incorporate the whole territory into one time zone.
@@ -2128,7 +2160,7 @@
# From Michaela Rodrigue, writing in the
# Nunatsiaq News (1999-11-19):
-# http://www.nunatsiaq.com/archives/nunavut991130/nvt91119_17.html
+# http://www.nunatsiaqonline.ca/archives/nunavut991130/nvt91119_17.html
# Clyde River, Pangnirtung and Sanikiluaq now operate with two time zones,
# central - or Nunavut time - for government offices, and eastern time
# for municipal offices and schools.... Igloolik [was similar but then]
@@ -2146,7 +2178,7 @@
# Central Time and Southampton Island [in the Central zone] is not
# required to use daylight savings.
-# From <http://www.nunatsiaq.com/archives/nunavut001130/nvt21110_02.html>
+# From <http://www.nunatsiaqonline.ca/archives/nunavut001130/nvt21110_02.html>
# Nunavut now has two time zones (2000-11-10):
# The Nunavut government would allow its employees in Kugluktuk and
# Cambridge Bay to operate on central time year-round, putting them
@@ -2477,7 +2509,7 @@
# http://gaceta.diputados.gob.mx/Gaceta/61/2009/dic/V2-101209.html
#
# Our page:
-# http://www.timeanddate.com/news/time/north-mexico-dst-change.html
+# https://www.timeanddate.com/news/time/north-mexico-dst-change.html
# From Arthur David Olson (2010-01-20):
# The page
@@ -2896,7 +2928,7 @@
# http://www.nnc.cubaweb.cu/marzo-2008/cien-1-11-3-08.htm
#
# Some more background information is posted here:
-# http://www.timeanddate.com/news/time/cuba-starts-dst-march-16.html
+# https://www.timeanddate.com/news/time/cuba-starts-dst-march-16.html
#
# The article also says that Cuba has been observing DST since 1963,
# while Shanks (and tzdata) has 1965 as the first date (except in the
@@ -2943,7 +2975,7 @@
# http://granma.co.cu/2011/03/08/nacional/artic01.html
#
# Our info:
-# http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html
+# https://www.timeanddate.com/news/time/cuba-starts-dst-2011.html
#
# From Steffen Thorsen (2011-10-30)
# Cuba will end DST two weeks later this year. Instead of going back
@@ -2953,7 +2985,7 @@
# http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html
#
# Our page:
-# http://www.timeanddate.com/news/time/cuba-time-changes-2011.html
+# https://www.timeanddate.com/news/time/cuba-time-changes-2011.html
#
# From Steffen Thorsen (2012-03-01)
# According to Radio Reloj, Cuba will start DST on Midnight between March
@@ -2963,7 +2995,7 @@
# http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril
#
# Our info on it:
-# http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html
+# https://www.timeanddate.com/news/time/cuba-starts-dst-2012.html
# From Steffen Thorsen (2012-11-03):
# Radio Reloj and many other sources report that Cuba is changing back
@@ -3158,8 +3190,8 @@
# From Steffen Thorsen (2016-03-12):
# Jean Antoine, editor of www.haiti-reference.com informed us that Haiti
# are not going on DST this year. Several other resources confirm this: ...
-# http://www.radiotelevisioncaraibes.com/presse/heure_d_t_pas_de_changement_d_heure_pr_vu_pour_cet_ann_e.html
-# http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
+# https://www.radiotelevisioncaraibes.com/presse/heure_d_t_pas_de_changement_d_heure_pr_vu_pour_cet_ann_e.html
+# https://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
# http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/
# From Steffen Thorsen (2017-03-12):
@@ -3358,7 +3390,7 @@
# Turks and Caicos
#
# From Chris Dunn in
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415007
+# https://bugs.debian.org/415007
# (2007-03-15): In the Turks & Caicos Islands (America/Grand_Turk) the
# daylight saving dates for time changes have been adjusted to match
# the recent U.S. change of dates.
@@ -3380,12 +3412,25 @@
# "permanent daylight saving time" by one year....
# http://tcweeklynews.com/time-change-to-go-ahead-this-november-p5437-127.htm
#
+# From the Turks & Caicos Cabinet (2017-07-20), heads-up from Steffen Thorsen:
+# ... agreed to the reintroduction in TCI of Daylight Saving Time (DST)
+# during the summer months and Standard Time, also known as Local
+# Time, during the winter months with effect from April 2018 ...
+# https://www.gov.uk/government/news/turks-and-caicos-post-cabinet-meeting-statement--3
+#
+# From Paul Eggert (2017-08-26):
+# The date of effect of the spring 2018 change appears to be March 11,
+# which makes more sense. See: Hamilton D. Time change back
+# by March 2018 for TCI. Magnetic Media. 2017-08-25.
+# http://magneticmediatv.com/2017/08/time-change-back-by-march-2018-for-tci/
+#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Grand_Turk -4:44:32 - LMT 1890
-5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST 1979
-5:00 US E%sT 2015 Nov Sun>=1 2:00
- -4:00 - AST
+ -4:00 - AST 2018 Mar 11 3:00
+ -5:00 US E%sT
# British Virgin Is
# Virgin Is
--- a/test/jdk/sun/util/calendar/zi/tzdata/southamerica Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/sun/util/calendar/zi/tzdata/southamerica Mon Nov 13 13:18:35 2017 -0800
@@ -45,7 +45,7 @@
#
# For data circa 1899, a common source is:
# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
+# https://www.jstor.org/stable/1774359
#
# These tables use numeric abbreviations like -03 and -0330 for
# integer hour and minute UTC offsets. Although earlier editions used
@@ -288,8 +288,8 @@
#
# Es inminente que en San Luis atrasen una hora los relojes
# (It is imminent in San Luis clocks one hour delay)
-# http://www.lagaceta.com.ar/nota/253414/Economia/Es-inminente-que-en-San-Luis-atrasen-una-hora-los-relojes.html
-# http://www.worldtimezone.net/dst_news/dst_news_argentina02.html
+# https://www.lagaceta.com.ar/nota/253414/Economia/Es-inminente-que-en-San-Luis-atrasen-una-hora-los-relojes.html
+# http://www.worldtimezone.com/dst_news/dst_news_argentina02.html
# From Jesper Nørgaard Welen (2008-01-18):
# The page of the San Luis provincial government
@@ -408,7 +408,7 @@
# Perhaps San Luis operates on the legal fiction that it is at -04
# with perpetual summer time, but ordinary usage typically seems to
# just say it's at -03; see, for example,
-# http://es.wikipedia.org/wiki/Hora_oficial_argentina
+# https://es.wikipedia.org/wiki/Hora_oficial_argentina
# We've documented similar situations as being plain changes to
# standard time, so let's do that here too. This does not change UTC
# offsets, only tm_isdst and the time zone abbreviations. One minor
@@ -739,7 +739,7 @@
# (Portuguese)
#
# We have a written a short article about it as well:
-# http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html
+# https://www.timeanddate.com/news/time/brazil-dst-2008-2009.html
#
# From Alexander Krivenyshev (2011-10-04):
# State Bahia will return to Daylight savings time this year after 8 years off.
@@ -748,7 +748,7 @@
# In Portuguese:
# http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html
-# http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html
+# https://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html
# From Guilherme Bernardes Rodrigues (2011-10-07):
# There is news in the media, however there is still no decree about it.
@@ -774,16 +774,16 @@
# From Rodrigo Severo (2012-10-16):
# Tocantins state will have DST.
-# http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html
+# https://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html
# From Steffen Thorsen (2013-09-20):
# Tocantins in Brazil is very likely not to observe DST from October....
# http://conexaoto.com.br/2013/09/18/ministerio-confirma-que-tocantins-esta-fora-do-horario-de-verao-em-2013-mas-falta-publicacao-de-decreto
# We will keep this article updated when this is confirmed:
-# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
+# https://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
# From Steffen Thorsen (2013-10-17):
-# http://www.timeanddate.com/news/time/acre-amazonas-change-time-zone.html
+# https://www.timeanddate.com/news/time/acre-amazonas-change-time-zone.html
# Senator Jorge Viana announced that Acre will change time zone on November 10.
# He did not specify the time of the change, nor if western parts of Amazonas
# will change as well.
@@ -1099,18 +1099,18 @@
# the following source, cited by Oscar van Vlijmen (2006-10-08):
# [1] Chile Law
# http://www.webexhibits.org/daylightsaving/chile.html
-# This contains a copy of a this official table:
+# This contains a copy of this official table:
# Cambios en la hora oficial de Chile desde 1900 (retrieved 2008-03-30)
-# http://web.archive.org/web/20080330200901/http://www.horaoficial.cl/cambio.htm
+# https://web.archive.org/web/20080330200901/http://www.horaoficial.cl/cambio.htm
# [1] needs several corrections, though.
#
# The first set of corrections is from:
# [2] History of the Official Time of Chile
# http://www.horaoficial.cl/ing/horaof_ing.html (retrieved 2012-03-06). See:
-# http://web.archive.org/web/20120306042032/http://www.horaoficial.cl/ing/horaof_ing.html
+# https://web.archive.org/web/20120306042032/http://www.horaoficial.cl/ing/horaof_ing.html
# This is an English translation of:
# Historia de la hora oficial de Chile (retrieved 2012-10-24). See:
-# http://web.archive.org/web/20121024234627/http://www.horaoficial.cl/horaof.htm
+# https://web.archive.org/web/20121024234627/http://www.horaoficial.cl/horaof.htm
# A fancier Spanish version (requiring mouse-clicking) is at:
# http://www.horaoficial.cl/historia_hora.html
# Conflicts between [1] and [2] were resolved as follows:
@@ -1386,10 +1386,10 @@
# Milne says the Central and South American Telegraph Company used -5:24:15.
#
# From Alois Treindl (2016-12-15):
-# http://www.elcomercio.com/actualidad/hora-sixto-1993.html
+# https://www.elcomercio.com/actualidad/hora-sixto-1993.html
# ... Whether the law applied also to Galápagos, I do not know.
# From Paul Eggert (2016-12-15):
-# http://www.elcomercio.com/afull/modificacion-husohorario-ecuador-presidentes-decreto.html
+# https://www.elcomercio.com/afull/modificacion-husohorario-ecuador-presidentes-decreto.html
# This says President Sixto Durán Ballén signed decree No. 285, which
# established DST from 1992-11-28 to 1993-02-05; it does not give transition
# times. The people called it "hora de Sixto" ("Sixto hour"). The change did
@@ -1801,7 +1801,7 @@
# hours of presidential broadcasts, hours of lines,' quipped comedian
# Jean Mary Curró ...". See: Cawthorne A, Kai D. Venezuela scraps
# half-hour time difference set by Chavez. Reuters 2016-04-15 14:50 -0400
-# http://www.reuters.com/article/us-venezuela-timezone-idUSKCN0XC2BE
+# https://www.reuters.com/article/us-venezuela-timezone-idUSKCN0XC2BE
#
# From Matt Johnson (2016-04-20):
# ... published in the official Gazette [2016-04-18], here:
--- a/test/jdk/sun/util/calendar/zi/tzdata/zone.tab Mon Nov 13 12:10:49 2017 -0800
+++ b/test/jdk/sun/util/calendar/zi/tzdata/zone.tab Mon Nov 13 13:18:35 2017 -0800
@@ -209,7 +209,7 @@
GD +1203-06145 America/Grenada
GE +4143+04449 Asia/Tbilisi
GF +0456-05220 America/Cayenne
-GG +4927-00232 Europe/Guernsey
+GG +492717-0023210 Europe/Guernsey
GH +0533-00013 Africa/Accra
GI +3608-00521 Europe/Gibraltar
GL +6411-05144 America/Godthab Greenland (most areas)
@@ -244,7 +244,7 @@
IR +3540+05126 Asia/Tehran
IS +6409-02151 Atlantic/Reykjavik
IT +4154+01229 Europe/Rome
-JE +4912-00207 Europe/Jersey
+JE +491101-0020624 Europe/Jersey
JM +175805-0764736 America/Jamaica
JO +3157+03556 Asia/Amman
JP +353916+1394441 Asia/Tokyo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/JDK-8190391.js Mon Nov 13 13:18:35 2017 -0800
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8190391 : nashorn: "!!" of nonzero even integer var becomes false when returned
+ *
+ * @test
+ * @run
+ */
+
+
+function func(x){
+ return !!x;
+}
+print(func(0));
+print(func(2));
+print(func(3));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/JDK-8190391.js.EXPECTED Mon Nov 13 13:18:35 2017 -0800
@@ -0,0 +1,3 @@
+false
+true
+true
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java Mon Nov 13 12:10:49 2017 -0800
+++ b/test/nashorn/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java Mon Nov 13 13:18:35 2017 -0800
@@ -47,6 +47,10 @@
final Object o2 = mi2.getInstance();
if (o1 instanceof ITest && o2 instanceof ITest) {
return ((ITest)o1).getTestName().compareTo(((ITest)o2).getTestName());
+ } else if (o1 instanceof ITest) {
+ return 1;
+ } else if (o2 instanceof ITest) {
+ return -1;
}
// something else, don't care about the order
return 0;