jdk8-mips64-public/nashorn: changeset 2398:b347bb8a4cab

     1.1 --- a/.hgtags	Thu Oct 04 10:20:58 2018 +0100
     1.2 +++ b/.hgtags	Mon Oct 15 15:28:24 2018 +0100
     1.3 @@ -864,6 +864,51 @@
     1.4  0a93e6a9934e9e81e96b74e11402793026abfe55 jdk8u162-b11
     1.5  3f877d379c48178a1203089ea56b4e8061689b5d jdk8u162-b12
     1.6  3c567ee8d853375cafa61378ab890bb4e82d98c2 jdk8u162-b31
     1.7 +59508dc01b26fa97854f4fed3ae466e3e3eb3a3e jdk8u162-b32
     1.8 +4eff9c0f63f007c22495a4d4ab5c295499554855 jdk8u162-b33
     1.9 +e6b190611af9e2b56270d45fdabb863ece49b600 jdk8u162-b34
    1.10 +3702c8d746075071f459a422a9f226f3a5be5c2f jdk8u171-b00
    1.11 +8281166a86a5ebee40858b6ed2f6068e640b0099 jdk8u171-b01
    1.12 +710e8cf9b7a554469bbaf78e371eb1f4fe086ce2 jdk8u171-b02
    1.13 +42903e21ee6aaab01763aa04a76378381d0ca58d jdk8u171-b03
    1.14 +0f09c1423f3454cac9eef7240d2ff831a104b4d8 jdk8u171-b04
    1.15 +801694cc35e00907f3ef382ae1495e2dadd22278 jdk8u171-b05
    1.16 +3ae3ebe2e2ee5648c38862179b2b1d1951ad97d7 jdk8u172-b00
    1.17 +8b311af3f1b260035ff12e86e324f8254b1d760b jdk8u172-b01
    1.18 +e5e19194a8a2ce6849791bbc2aea2ac1632cdbc2 jdk8u172-b02
    1.19 +93b6ac37872647ca64877561035f43473da96c04 jdk8u172-b03
    1.20 +9bd2bd2edbd7c205deafc89c97cb882bce9f232c jdk8u172-b04
    1.21 +42903e21ee6aaab01763aa04a76378381d0ca58d jdk8u181-b00
    1.22 +42903e21ee6aaab01763aa04a76378381d0ca58d jdk8u171-b03
    1.23 +0f09c1423f3454cac9eef7240d2ff831a104b4d8 jdk8u171-b04
    1.24 +801694cc35e00907f3ef382ae1495e2dadd22278 jdk8u171-b05
    1.25 +bb41125356006139d5e56a1c67a55779a42a5a9e jdk8u171-b06
    1.26 +059028cb56528c8f1673497ad52f847b28eba43a jdk8u171-b07
    1.27 +fd005fcf00fe65dad4b86508a5cd2ea5c627acd5 jdk8u171-b08
    1.28 +9d9a43a064fc3db9a65a41accf707fc43605955f jdk8u171-b09
    1.29 +e9b4feb9ed6ac7d8d620b162f8780f8470b21711 jdk8u171-b10
    1.30 +921be31addf6c9fda681af76bec704780e5f2084 jdk8u171-b11
    1.31 +3ae3ebe2e2ee5648c38862179b2b1d1951ad97d7 jdk8u172-b00
    1.32 +8b311af3f1b260035ff12e86e324f8254b1d760b jdk8u172-b01
    1.33 +e5e19194a8a2ce6849791bbc2aea2ac1632cdbc2 jdk8u172-b02
    1.34 +93b6ac37872647ca64877561035f43473da96c04 jdk8u172-b03
    1.35 +9bd2bd2edbd7c205deafc89c97cb882bce9f232c jdk8u172-b04
    1.36 +c6d01f70f16682bcfcca4c5a85424a33bed96298 jdk8u172-b05
    1.37 +bb62c7f3b3edf266edd5d093418958f1dc909ce7 jdk8u172-b06
    1.38 +b14b138cc741dfb9980896516468a95c8c290cd7 jdk8u172-b07
    1.39 +32ba142b2880976087c6da77cc32e58a5d0e8798 jdk8u172-b08
    1.40 +1353afc92267dd05157f752d698fba528924e1a2 jdk8u172-b09
    1.41 +3087d3a4983a9f280e6b29582486e81f020973f2 jdk8u172-b10
    1.42 +df6d51bc4491fd9fc6aacdb840d2d4d6a07efb03 jdk8u172-b11
    1.43 +8daca0fd12400791d3fea02a5e9fc195deee06e2 jdk8u181-b01
    1.44 +51994ad46b6c3be364677138e4f6e123a6c4e3c3 jdk8u181-b02
    1.45 +4a9aad281a0ee5b34e9e1be146bfc564eaa0ae03 jdk8u181-b03
    1.46 +5a0b8cd7f9b5cd6099bf7c0536bd114dd4cbf545 jdk8u191-b00
    1.47 +c6d01f70f16682bcfcca4c5a85424a33bed96298 jdk8u172-b05
    1.48 +7ea9b82890105406d1ac7316b28559ccc05768c0 jdk8u162-b35
    1.49 +7de7950c0351ccd6f82787090b78c16b0384b90c jdk8u162-b36
    1.50 +4aac2244c3a94ab41a583a7570b195f3f638069c jdk8u162-b37
    1.51 +4c81e132698244f1b7f93a4d2c3d872dbb24bbc4 jdk8u162-b38
    1.52  3702c8d746075071f459a422a9f226f3a5be5c2f jdk8u171-b00
    1.53  8281166a86a5ebee40858b6ed2f6068e640b0099 jdk8u171-b01
    1.54  710e8cf9b7a554469bbaf78e371eb1f4fe086ce2 jdk8u171-b02
    1.55 @@ -889,6 +934,13 @@
    1.56  1353afc92267dd05157f752d698fba528924e1a2 jdk8u172-b09
    1.57  3087d3a4983a9f280e6b29582486e81f020973f2 jdk8u172-b10
    1.58  df6d51bc4491fd9fc6aacdb840d2d4d6a07efb03 jdk8u172-b11
    1.59 +1ade28deec4a0a92e4ee1d743fbd88594d2b033a jdk8u172-b31
    1.60 +228f8e1dceb069247fad31d08baf61d7a57236a8 jdk8u172-b32
    1.61 +8c6bd9d0cf71f8014a6c4840a051068660128a3c jdk8u172-b33
    1.62 +fbb5a1798b866f62862e7b76f340fd9882f325e1 jdk8u172-b34
    1.63 +7b299af843c764a53e38ffaca7b307cce64ca4e8 jdk8u172-b35
    1.64 +2a333371ef73230759cd207b3ed544331ed6b7e5 jdk8u172-b36
    1.65 +28cbe440b3c42aa68cff042394ecf3a805e1b569 jdk8u172-b37
    1.66  8daca0fd12400791d3fea02a5e9fc195deee06e2 jdk8u181-b01
    1.67  51994ad46b6c3be364677138e4f6e123a6c4e3c3 jdk8u181-b02
    1.68  4a9aad281a0ee5b34e9e1be146bfc564eaa0ae03 jdk8u181-b03
    1.69 @@ -902,9 +954,34 @@
    1.70  381f2224e3c3eadc2e3bfaf81d43be2d1f8078b9 jdk8u181-b11
    1.71  6372ac5af37ae40a4875c6cdf5c28aeb2a701899 jdk8u181-b12
    1.72  3824009355133053ce6c714fff39d2e12dc67cde jdk8u181-b13
    1.73 +4706dc5f752c0e364413e62f19f905a543d602be jdk8u191-b01
    1.74 +9bae2c31c00bb6081026f7cb61aa50c726239a7a jdk8u191-b02
    1.75 +1d23567f6ea387f9e047dd0d81f303b6371a27fb jdk8u191-b03
    1.76 +c374c805e6fb531f05ffd5070a148633c6f0626a jdk8u191-b04
    1.77 +755288b11f2e8e9d59eb9149d65995b37bd4c9d7 jdk8u191-b05
    1.78 +5fa57cd058f2c5b0ad03581295decdbdea455eb3 jdk8u191-b06
    1.79 +878e65541b35df77127fccaf31397b981c9fa15e jdk8u191-b07
    1.80 +c25dc7436704829b04a1d8803dfd4f3b88ec9f06 jdk8u191-b08
    1.81 +a449d7e3eb3432c6ae9edcb30380c8f2a9fae45e jdk8u191-b09
    1.82 +0fcd632be9e7a67f17002adab0a9a03373f5c481 jdk8u191-b10
    1.83 +3388cb0fad9c8654cd6499835cbc190c8dbf2441 jdk8u191-b25
    1.84 +e6205ecef830a71d73a14d1f18765cf4c3ac7773 jdk8u191-b11
    1.85 +5a2c3b3dd9199561a1d4ba4a4b3bdfd7c6f69736 jdk8u191-b12
    1.86 +a53a027482b082dbecbdae9bb469fcd957d73900 jdk8u191-b26
    1.87  5b549167a92971d6793079c702fa2fd79a987cbc jdk8u182-b00
    1.88  a57083d7fe9ac674c0841db6849140424bb16eef jdk8u192-b00
    1.89  bc4618963547efc17931174f57bea387f89cd5e9 jdk8u192-b01
    1.90  1087a0aaf6a1e7f4c7708a7829b62c8a70b53782 jdk8u192-b02
    1.91  ab21284e5eaa5d6e521f679603efb56237f2286e jdk8u192-b03
    1.92  ab21284e5eaa5d6e521f679603efb56237f2286e jdk8u202-b00
    1.93 +2056d0c035e847b13083d4cf63d1003174e6b0d9 jdk8u192-b04
    1.94 +0d65cee9040926c0625b34e00450551f37042dc5 jdk8u192-b05
    1.95 +b1dfea491c0571cd5ffb21b3b0778ff90b9efafe jdk8u192-b06
    1.96 +d42d488fd8dcbe13c05958fd2b98696572157ee1 jdk8u192-b07
    1.97 +9d1371fc0987c02d1321d7263d88a782e5e5cdfa jdk8u192-b08
    1.98 +456c0d45c43bfbb5414b9ae0ca68227132b4af7b jdk8u192-b09
    1.99 +e58a7b05e786554d3447c3b04b11873314b549cd jdk8u192-b10
   1.100 +aa385e2ce23240f1466dbfcda5fd96ad325b109d jdk8u192-b25
   1.101 +9d6b5362a75ddef6ed30fe9892e95d7cfdff0ed8 jdk8u192-b11
   1.102 +854c8339d414bc20aa3c7603ad273aef5d668cde jdk8u192-b12
   1.103 +6aeb5e07e2bb8f64ee1d8f0651a2723f3a49e834 jdk8u192-b26

     2.1 --- a/THIRD_PARTY_README	Thu Oct 04 10:20:58 2018 +0100
     2.2 +++ b/THIRD_PARTY_README	Mon Oct 15 15:28:24 2018 +0100
     2.3 @@ -1497,7 +1497,7 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to libpng 1.6.16, which may be 
     2.8 +%% This notice is provided with respect to libpng 1.6.35, which may be
     2.9  included with JRE 8, JDK 8, and OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12 @@ -1513,21 +1513,21 @@
    2.13  
    2.14  This code is released under the libpng license.
    2.15  
    2.16 -libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
    2.17 -Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
    2.18 -distributed according to the same disclaimer and license as libpng-1.2.5
    2.19 -with the following individual added to the list of Contributing Authors
    2.20 -
    2.21 -   Cosmin Truta
    2.22 -
    2.23 -libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
    2.24 -Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
    2.25 -distributed according to the same disclaimer and license as libpng-1.0.6
    2.26 -with the following individuals added to the list of Contributing Authors
    2.27 +libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
    2.28 +Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
    2.29 +derived from libpng-1.0.6, and are distributed according to the same
    2.30 +disclaimer and license as libpng-1.0.6 with the following individuals
    2.31 +added to the list of Contributing Authors:
    2.32  
    2.33     Simon-Pierre Cadieux
    2.34     Eric S. Raymond
    2.35 +   Mans Rullgard
    2.36 +   Cosmin Truta
    2.37     Gilles Vollant
    2.38 +   James Yu
    2.39 +   Mandar Sahastrabuddhe
    2.40 +   Google Inc.
    2.41 +   Vadim Barkov
    2.42  
    2.43  and with the following additions to the disclaimer:
    2.44  
    2.45 @@ -1538,19 +1538,25 @@
    2.46     risk of satisfactory quality, performance, accuracy, and effort is with
    2.47     the user.
    2.48  
    2.49 +Some files in the "contrib" directory and some configure-generated
    2.50 +files that are distributed with libpng have other copyright owners and
    2.51 +are released under other open source licenses.
    2.52 +
    2.53  libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
    2.54 -Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
    2.55 -distributed according to the same disclaimer and license as libpng-0.96,
    2.56 -with the following individuals added to the list of Contributing Authors:
    2.57 +Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
    2.58 +libpng-0.96, and are distributed according to the same disclaimer and
    2.59 +license as libpng-0.96, with the following individuals added to the list
    2.60 +of Contributing Authors:
    2.61  
    2.62     Tom Lane
    2.63     Glenn Randers-Pehrson
    2.64     Willem van Schaik
    2.65  
    2.66  libpng versions 0.89, June 1996, through 0.96, May 1997, are
    2.67 -Copyright (c) 1996, 1997 Andreas Dilger
    2.68 -Distributed according to the same disclaimer and license as libpng-0.88,
    2.69 -with the following individuals added to the list of Contributing Authors:
    2.70 +Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
    2.71 +and are distributed according to the same disclaimer and license as
    2.72 +libpng-0.88, with the following individuals added to the list of
    2.73 +Contributing Authors:
    2.74  
    2.75     John Bowler
    2.76     Kevin Bracey
    2.77 @@ -1559,8 +1565,11 @@
    2.78     Greg Roelofs
    2.79     Tom Tanner
    2.80  
    2.81 +Some files in the "scripts" directory have other copyright owners
    2.82 +but are released under this license.
    2.83 +
    2.84  libpng versions 0.5, May 1995, through 0.88, January 1996, are
    2.85 -Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
    2.86 +Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
    2.87  
    2.88  For the purposes of this copyright and license, "Contributing Authors"
    2.89  is defined as the following set of individuals:
    2.90 @@ -1583,13 +1592,13 @@
    2.91  source code, or portions hereof, for any purpose, without fee, subject
    2.92  to the following restrictions:
    2.93  
    2.94 -1. The origin of this source code must not be misrepresented.
    2.95 -
    2.96 -2. Altered versions must be plainly marked as such and must not
    2.97 -   be misrepresented as being the original source.
    2.98 -
    2.99 -3. This Copyright notice may not be removed or altered from any
   2.100 -   source or altered source distribution.
   2.101 +  1. The origin of this source code must not be misrepresented.
   2.102 +
   2.103 +  2. Altered versions must be plainly marked as such and must not
   2.104 +     be misrepresented as being the original source.
   2.105 +
   2.106 +  3. This Copyright notice may not be removed or altered from any
   2.107 +     source or altered source distribution.
   2.108  
   2.109  The Contributing Authors and Group 42, Inc. specifically permit, without
   2.110  fee, and encourage the use of this source code as a component to
   2.111 @@ -1597,21 +1606,34 @@
   2.112  source code in a product, acknowledgment is not required but would be
   2.113  appreciated.
   2.114  
   2.115 -
   2.116 -A "png_get_copyright" function is available, for convenient use in "about"
   2.117 -boxes and the like:
   2.118 -
   2.119 -   printf("%s",png_get_copyright(NULL));
   2.120 -
   2.121 -Also, the PNG logo (in PNG format, of course) is supplied in the
   2.122 -files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
   2.123 -
   2.124 -Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
   2.125 -certification mark of the Open Source Initiative.
   2.126 +END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
   2.127 +
   2.128 +TRADEMARK:
   2.129 +
   2.130 +The name "libpng" has not been registered by the Copyright owner
   2.131 +as a trademark in any jurisdiction.  However, because libpng has
   2.132 +been distributed and maintained world-wide, continually since 1995,
   2.133 +the Copyright owner claims "common-law trademark protection" in any
   2.134 +jurisdiction where common-law trademark is recognized.
   2.135 +
   2.136 +OSI CERTIFICATION:
   2.137 +
   2.138 +Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is
   2.139 +a certification mark of the Open Source Initiative. OSI has not addressed
   2.140 +the additional disclaimers inserted at version 1.0.7.
   2.141 +
   2.142 +EXPORT CONTROL:
   2.143 +
   2.144 +The Copyright owner believes that the Export Control Classification
   2.145 +Number (ECCN) for libpng is EAR99, which means not subject to export
   2.146 +controls or International Traffic in Arms Regulations (ITAR) because
   2.147 +it is open source, publicly available software, that does not contain
   2.148 +any encryption software.  See the EAR, paragraphs 734.3(b)(3) and
   2.149 +734.7(b).
   2.150  
   2.151  Glenn Randers-Pehrson
   2.152  glennrp at users.sourceforge.net
   2.153 -December 22, 2014
   2.154 +July 15, 2018
   2.155  
   2.156  --- end of LICENSE ---
   2.157

     3.1 --- a/src/jdk/nashorn/internal/objects/Global.java	Thu Oct 04 10:20:58 2018 +0100
     3.2 +++ b/src/jdk/nashorn/internal/objects/Global.java	Mon Oct 15 15:28:24 2018 +0100
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -1427,13 +1427,14 @@
    3.11              }
    3.12          }
    3.13  
    3.14 -        switch (nameStr) {
    3.15 -        case "context":
    3.16 +        if ("context".equals(nameStr)) {
    3.17              return sctxt;
    3.18 -        case "engine":
    3.19 -            return global.engine;
    3.20 -        default:
    3.21 -            break;
    3.22 +        } else if ("engine".equals(nameStr)) {
    3.23 +            // expose "engine" variable only when there is no security manager
    3.24 +            // or when no class filter is set.
    3.25 +            if (System.getSecurityManager() == null || global.getClassFilter() == null) {
    3.26 +                return global.engine;
    3.27 +            }
    3.28          }
    3.29  
    3.30          if (self == UNDEFINED) {

.hgtags		file \| annotate \| diff \| comparison \| revisions
THIRD_PARTY_README		file \| annotate \| diff \| comparison \| revisions

Mercurial > jdk8-mips64-public > nashorn / changeset

changeset

Merge jdk8u202-b01