6988081: Use GetPrimitiveArrayCritical instead GetByteArray to Reduce allocation in some sunpkcs jni wrappers Summary: Changed to use GetPrimitiveArrayCritical for encryption and decryption. Reviewed-by: vinnie

Merge

Merge

6991164: pack source needs vendor rebranding changes (jdk7 only) Reviewed-by: ohair, jrose

6887853: javadoc for java.lang.Classloader should be more clear Summary: Updated the relevant javadoc description of java.lang.ClassLoader class w/ additional clarification. Reviewed-by: mullan

Merge

6894719: (launcher)The option -no-jre-restrict-search is expected when -jre-no-restrict-search is documented. Reviewed-by: darcy

6991300: MimeTable is unsafe Reviewed-by: alanb, michaelm

6989690: java/net native code compiler warnings Reviewed-by: alanb

6983520: java/io/pathNames/GeneralWin32.java fails with jdk7-b108 (win) Reviewed-by: sherman

6728842: File.setReadOnly does not make a directory read-only (win) 6464744: java/io/File/SetAccess.java ignores sticky bit Reviewed-by: forax

6984046: java/jar jar/pack source needs vendor rebranding changes (jdk7 only) Summary: updated to use appropriate vendor name Reviewed-by: ohair, dholmes

6977738: Deadlock between java.lang.ClassLoader and java.util.Properties Reviewed-by: alanb, sherman, darcy, igor

Merge

Merge

Merge

6622002: UIDefault.ProxyLazyValue has unsafe reflection usage Reviewed-by: malenkov

6986400: Change Cookie to Cookie2 in 6980004 fix Summary: fix error in previous fix for 6980004 Reviewed-by: chegar

6980004: limit HTTP request cookie headers in HttpURLConnection 6961084: limit setting of some request headers in HttpURLConnection Reviewed-by: chegar

6981426: limit use of TRACE method in HttpURLConnection Reviewed-by: chegar

6974093: Thread.clone should NOT invoke addUnstarted on started threads Reviewed-by: dholmes, coffeys

6952017: HttpURLConnection chunked encoding issue (Http request splitting) Reviewed-by: chegar

6952603: NetworkInterface reveals local network address to untrusted code Reviewed-by: chegar

Merge

Merge

Merge

6963489: ZDI-CAN-803: Sun JRE ICC Profile Device Information Tag Remote Code Execution Vulnerability Reviewed-by: prr

Merge

6926623: Thread clone issues Reviewed-by: hawtin

6963023: ZDI-CAN-809: Sun JRE JPEGImageWriter.writeImage Remote Code Execution Vulnerability Reviewed-by: prr

Merge

Merge

6938813: Swing mutable statics Reviewed-by: peterz, alexp

6925710: IndexColorModel.finalize can be made to double free Reviewed-by: igor, prr, hawtin

6958060: Malformed AP-REQ crashes acceptor side Reviewed-by: valeriep, xuelei

6957564: Disclosure of DNS server IP address Reviewed-by: xuelei, chegar

Merge

Merge

6914943: Implement final TLS renegotiation fix Summary: RFC 5746 implementation Reviewed-by: wetmore, weijun

6987154: HTML link to serialization guide is broken Reviewed-by: skannan

6990639: Fix for #6975829 breaks build Summary: define MIN2 micro Reviewed-by: alanb

Merge

6989116: (verifier) compiler warning messages Reviewed-by: kamg, ohair

6975829: Perf. of gzip in existing JDKs is too slower than in 1.3.1 Summary: Improved memory/buffer handling in Inflater.c Reviewed-by: alanb

6989466: Miscellaneous compiler warnings in java/lang, java/util, java/io, sun/misc native code Reviewed-by: andrew, mchung, ohair

6989903: (process) test/java/lang/ProcessBuilder/Basic.java failing with "Bad file number" (sol) Reviewed-by: ohair, chegar

6917323: serializable classes in java.dyn do not specify serialVersionUIDs Reviewed-by: jrose

6988317: RowSetProvider.newFactory() may throw unspecified exception Reviewed-by: darcy

6988310: SyncFactory.setLogger(Logger,Level) requires unspecified security permission Reviewed-by: darcy

6987116: (so) test/java/nio/channels/SocketChannel/VectorIO.java failed on Solaris 11 Reviewed-by: forax

Merge

6992272: I18N: Locale.getDisplayName() and toString() return empty if just script is set Reviewed-by: srl Contributed-by: y.umaoka@gmail.com

Merge

6638110: (tz) TimeZone.getDisplayName(...) spec is inconsistent with implementation for unavailable locales Reviewed-by: peytoia

6991013: Serialized form for java.util.Locale contains typos Reviewed-by: peytoia

6575419: Solaris : XSetICFoucs is not called with Java application at appropriate timing Reviewed-by: okutsu