hg: jdk/sandbox: http-client-branch: merge with default
chris.hegarty at oracle.com
chris.hegarty at oracle.com
Thu Dec 7 12:26:15 UTC 2017
Changeset: 4d9b002587db
Author: chegar
Date: 2017-12-07 11:54 +0000
URL: http://hg.openjdk.java.net/jdk/sandbox/rev/4d9b002587db
http-client-branch: merge with default
- src/hotspot/share/classfile/vmSymbols_ext.hpp
- src/hotspot/share/gc/g1/hSpaceCounters.cpp
- src/hotspot/share/gc/g1/hSpaceCounters.hpp
- src/hotspot/share/services/g1MemoryPool.cpp
- src/hotspot/share/services/g1MemoryPool.hpp
- src/hotspot/share/services/jmm.h
- src/hotspot/share/services/psMemoryPool.cpp
- src/hotspot/share/services/psMemoryPool.hpp
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIA64.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/linux/ia64/LinuxIA64ThreadContext.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64Thread.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadContext.java
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadFactory.java
! src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AbstractAsyncSSLConnection.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncEvent.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLConnection.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AsyncSSLTunnelConnection.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/AuthenticationFilter.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BufferingSubscriber.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ConnectionPool.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/CookieFilter.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Exchange.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExchangeImpl.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/FilterFactory.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HeaderParser.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1AsyncReceiver.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Exchange.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Request.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http1Response.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2ClientImpl.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClient.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientBuilderImpl.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientFacade.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpClientImpl.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpConnection.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpHeaders.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestBuilderImpl.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequestImpl.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponseImpl.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ImmutableHeaders.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiExchange.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/MultiMapResult.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainHttpConnection.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainTunnelingConnection.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PullPublisher.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PushGroup.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RawChannelImpl.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RedirectFilter.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestPublishers.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Response.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseContent.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseSubscribers.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SSLDelegate.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/SocketTube.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Stream.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WebSocket.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowController.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/WindowUpdateSender.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ByteBufferReference.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/ConnectionExpiredException.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/DebugLogger.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/FlowTube.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/HttpHeadersImpl.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Log.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/MinimalFuture.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SSLFlowDelegate.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SSLTube.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SequentialScheduler.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/SubscriberWrapper.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/common/Utils.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ContinuationFrame.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/DataFrame.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/ErrorFrame.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesDecoder.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/FramesEncoder.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeaderFrame.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/HeadersFrame.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/Http2Frame.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/frame/PushPromiseFrame.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HPACK.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/hpack/HeaderTable.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/BuilderImpl.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/MessageStreamConsumer.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/OpeningHandshake.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Receiver.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/Transmitter.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/TransportSupplier.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketImpl.java
! src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/internal/websocket/WebSocketRequest.java
! src/jdk.incubator.httpclient/share/classes/module-info.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/memory/address/RawAddressNode.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Constants.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrap.java
- src/utils/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java
- test/hotspot/jtreg/gc/metaspace/PerfCounter.java
- test/hotspot/jtreg/gc/metaspace/PerfCounters.java
! test/jdk/ProblemList.txt
! test/jdk/java/net/httpclient/AbstractNoBody.java
! test/jdk/java/net/httpclient/BasicAuthTest.java
! test/jdk/java/net/httpclient/BufferingSubscriberCancelTest.java
! test/jdk/java/net/httpclient/BufferingSubscriberErrorCompleteTest.java
! test/jdk/java/net/httpclient/BufferingSubscriberTest.java
! test/jdk/java/net/httpclient/CancelledResponse.java
! test/jdk/java/net/httpclient/HeadersTest1.java
! test/jdk/java/net/httpclient/HeadersTest2.java
! test/jdk/java/net/httpclient/HttpClientBuilderTest.java
! test/jdk/java/net/httpclient/HttpInputStreamTest.java
! test/jdk/java/net/httpclient/HttpRequestBuilderTest.java
! test/jdk/java/net/httpclient/HttpResponseInputStreamTest.java
! test/jdk/java/net/httpclient/ManyRequests.java
! test/jdk/java/net/httpclient/ManyRequestsLegacy.java
! test/jdk/java/net/httpclient/MockServer.java
! test/jdk/java/net/httpclient/MultiAuthTest.java
! test/jdk/java/net/httpclient/NoBodyPartOne.java
! test/jdk/java/net/httpclient/NoBodyPartTwo.java
! test/jdk/java/net/httpclient/ProxyServer.java
! test/jdk/java/net/httpclient/RequestBodyTest.java
! test/jdk/java/net/httpclient/RequestBuilderTest.java
! test/jdk/java/net/httpclient/SmokeTest.java
! test/jdk/java/net/httpclient/SplitResponse.java
! test/jdk/java/net/httpclient/TimeoutBasic.java
! test/jdk/java/net/httpclient/examples/WebSocketExample.java
! test/jdk/java/net/httpclient/http2/BasicTest.java
! test/jdk/java/net/httpclient/http2/FixedThreadPoolTest.java
! test/jdk/java/net/httpclient/http2/RedirectTest.java
! test/jdk/java/net/httpclient/http2/ServerPush.java
! test/jdk/java/net/httpclient/http2/TLSConnection.java
! test/jdk/java/net/httpclient/http2/Timeout.java
! test/jdk/java/net/httpclient/http2/jdk.incubator.httpclient/jdk/incubator/http/internal/hpack/HeaderTableTest.java
! test/jdk/java/net/httpclient/http2/server/BodyInputStream.java
! test/jdk/java/net/httpclient/http2/server/BodyOutputStream.java
! test/jdk/java/net/httpclient/http2/server/ExceptionallyCloseable.java
! test/jdk/java/net/httpclient/http2/server/Http2RedirectHandler.java
! test/jdk/java/net/httpclient/http2/server/Http2TestExchange.java
! test/jdk/java/net/httpclient/http2/server/Http2TestExchangeImpl.java
! test/jdk/java/net/httpclient/http2/server/Http2TestServer.java
! test/jdk/java/net/httpclient/http2/server/Http2TestServerConnection.java
! test/jdk/java/net/httpclient/http2/server/Queue.java
! test/jdk/java/net/httpclient/security/0.policy
! test/jdk/java/net/httpclient/security/1.policy
! test/jdk/java/net/httpclient/security/10.policy
! test/jdk/java/net/httpclient/security/11.policy
! test/jdk/java/net/httpclient/security/12.policy
! test/jdk/java/net/httpclient/security/14.policy
! test/jdk/java/net/httpclient/security/15.policy
! test/jdk/java/net/httpclient/security/2.policy
! test/jdk/java/net/httpclient/security/3.policy
! test/jdk/java/net/httpclient/security/4.policy
! test/jdk/java/net/httpclient/security/5.policy
! test/jdk/java/net/httpclient/security/6.policy
! test/jdk/java/net/httpclient/security/7.policy
! test/jdk/java/net/httpclient/security/8.policy
! test/jdk/java/net/httpclient/security/9.policy
! test/jdk/java/net/httpclient/security/Driver.java
! test/jdk/java/net/httpclient/security/Security.java
! test/jdk/java/net/httpclient/security/filePerms/httpclient.policy
! test/jdk/java/net/httpclient/websocket/BuildingWebSocketDriver.java
! test/jdk/java/net/httpclient/websocket/ConnectionHandover.java
! test/jdk/java/net/httpclient/websocket/HeaderWriterDriver.java
! test/jdk/java/net/httpclient/websocket/MaskerDriver.java
! test/jdk/java/net/httpclient/websocket/ReaderDriver.java
! test/jdk/java/net/httpclient/websocket/SendingTestDriver.java
! test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/BuildingWebSocketTest.java
! test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockListener.java
! test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/MockReceiver.java
! test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/ReceivingTest.java
! test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/SendingTest.java
! test/jdk/java/net/httpclient/websocket/jdk.incubator.httpclient/jdk/incubator/http/internal/websocket/TestSupport.java
! test/jdk/java/net/httpclient/websocket/security/WSURLPermissionTest.java
! test/jdk/java/net/httpclient/websocket/security/httpclient.policy
! test/jdk/java/net/httpclient/whitebox/Driver.java
! test/jdk/java/net/httpclient/whitebox/SSLEchoTubeTestDriver.java
! test/jdk/java/net/httpclient/whitebox/SSLTubeTestDriver.java
! test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/AbstractSSLTubeTest.java
! test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/ConnectionPoolTest.java
! test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/FlowTest.java
! test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/Http1HeaderParserTest.java
! test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SSLEchoTubeTest.java
! test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SSLTubeTest.java
! test/jdk/java/net/httpclient/whitebox/jdk.incubator.httpclient/jdk/incubator/http/SelectorTest.java
- test/jdk/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java
More information about the jdk-sandbox-changes
mailing list