changeset 12775:1439c11b3803

Merge
author coffeys
date Tue, 01 Aug 2017 18:12:11 +0100
parents 1a3c50d9b0d5 969c0ffacd13
children dad1c479844c
files
diffstat 4 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Aug 01 16:36:54 2017 +0100
+++ b/.hgtags	Tue Aug 01 18:12:11 2017 +0100
@@ -722,6 +722,8 @@
 c6bc194fedb63b20c45c793405d215d206fb4654 jdk8u141-b13
 d630e23b8e36c2863225d7ae107c73a38d3e6102 jdk8u141-b14
 2ea94405100763c772ab3989200115d7a23c7532 jdk8u141-b15
+b64b1dfdbe7cfe3859f1023c0f1fb0216bce4ae7 jdk8u144-b00
+d2744852f3e64f7b0ba54f3a64ed5e2107e6ee68 jdk8u144-b01
 55899d2b99b0725d74eebc510a116423329ad6f0 jdk8u141-b31
 a3c4020f84aeb0dba467534239951f8818bdfb84 jdk8u141-b32
 072e084bceeedeb75467e40ca77786ac9ef5227a jdk8u151-b00
@@ -729,6 +731,8 @@
 bd40efd56b4544ff9048d2f7be4cf108b281a6f3 jdk8u151-b02
 58243fea3fe2669e93350bb4b77e188623b85503 jdk8u151-b03
 27273bbb711a402efe5fcd332003ba419102f662 jdk8u151-b04
+0efdf2c7a21464e5f3d89474ffdfe81db61031fd jdk8u151-b05
+c6c870e267de694bc85dc4af23a648824063f95b jdk8u151-b06
 1442bc728814af451e2dd1a6719a64485d27e3a0 jdk8u122-b00
 f6030acfa5aec0e64d45adfac69b9e7e5c12bc74 jdk8u122-b01
 6b072c3a6db7ab06804c91aab77431799dfb5d47 jdk8u122-b02
@@ -747,6 +751,8 @@
 9c692f8574178a5505efe39cdff1ea92d4f95cbd jdk8u152-b05
 636043375508d667052c84691c55d4c633376dbe jdk8u152-b06
 83998ef9e0b96e1f5f9d4667575a81e8aa06b981 jdk8u152-b07
+e62e091df75fd92bf9d8c573f6224132c99b33ea jdk8u152-b08
+eb71140d49732a226340c0e0a2224c0215fc161a jdk8u152-b09
 1442bc728814af451e2dd1a6719a64485d27e3a0 jdk8u122-b00
 f6030acfa5aec0e64d45adfac69b9e7e5c12bc74 jdk8u122-b01
 6b072c3a6db7ab06804c91aab77431799dfb5d47 jdk8u122-b02
--- a/src/share/classes/sun/net/ftp/impl/FtpClient.java	Tue Aug 01 16:36:54 2017 +0100
+++ b/src/share/classes/sun/net/ftp/impl/FtpClient.java	Tue Aug 01 18:12:11 2017 +0100
@@ -116,8 +116,8 @@
                 new PrivilegedAction<Object>() {
 
                     public Object run() {
-                        vals[0] = Integer.getInteger("sun.net.client.defaultReadTimeout", 0).intValue();
-                        vals[1] = Integer.getInteger("sun.net.client.defaultConnectTimeout", 0).intValue();
+                        vals[0] = Integer.getInteger("sun.net.client.defaultReadTimeout", 300_000).intValue();
+                        vals[1] = Integer.getInteger("sun.net.client.defaultConnectTimeout", 300_000).intValue();
                         encs[0] = System.getProperty("file.encoding", "ISO8859_1");
                         return null;
                     }
--- a/src/share/classes/sun/security/provider/certpath/ResponderId.java	Tue Aug 01 16:36:54 2017 +0100
+++ b/src/share/classes/sun/security/provider/certpath/ResponderId.java	Tue Aug 01 18:12:11 2017 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
--- a/src/share/classes/sun/security/util/ConstraintsParameters.java	Tue Aug 01 16:36:54 2017 +0100
+++ b/src/share/classes/sun/security/util/ConstraintsParameters.java	Tue Aug 01 18:12:11 2017 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 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