You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2020/07/17 03:39:39 UTC
[dubbo] 01/02: Merge branch '2.6.x' of
https://github.com/apache/dubbo into 2.6.x
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch hessian-whitelist2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 7a8d0f37962cfd3bced0cf230878d701e06f4b39
Merge: ff828b8 4a8abfd
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Jul 17 00:14:18 2020 +0800
Merge branch '2.6.x' of https://github.com/apache/dubbo into 2.6.x
NOTICE | 4 +-
README.md | 12 +-
all/pom.xml | 4 +-
bom/pom.xml | 2 +-
dependencies-bom/pom.xml | 4 +-
distribution/pom.xml | 4 +-
distribution/src/assembly/source-release.xml | 1 +
dubbo-cluster/pom.xml | 2 +-
.../cluster/support/FailoverClusterInvoker.java | 4 +-
dubbo-common/pom.xml | 2 +-
.../java/com/alibaba/dubbo/common/Constants.java | 4 +
.../common/store/support/SimpleDataStore.java | 4 +-
.../alibaba/dubbo/common/utils/SerialDetector.java | 211 +++++++++++++++++++++
.../src/main/resources/serial-blacklist.properties | 101 ++++++++++
.../dubbo/common/utils/SerialDetectorTest.java | 45 +++++
dubbo-common/src/test/resources/dubbo.properties | 4 +-
.../src/test/resources/security/invalid_data.ser | Bin 0 -> 4002 bytes
dubbo-config/dubbo-config-api/pom.xml | 2 +-
.../com/alibaba/dubbo/config/ReferenceConfig.java | 2 +-
dubbo-config/dubbo-config-spring/pom.xml | 2 +-
dubbo-config/pom.xml | 2 +-
dubbo-container/dubbo-container-api/pom.xml | 2 +-
dubbo-container/dubbo-container-log4j/pom.xml | 2 +-
dubbo-container/dubbo-container-logback/pom.xml | 2 +-
dubbo-container/dubbo-container-spring/pom.xml | 2 +-
dubbo-container/pom.xml | 2 +-
dubbo-demo/dubbo-demo-api/pom.xml | 2 +-
dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +-
dubbo-demo/dubbo-demo-provider/pom.xml | 2 +-
dubbo-demo/pom.xml | 2 +-
dubbo-filter/dubbo-filter-cache/pom.xml | 2 +-
dubbo-filter/dubbo-filter-validation/pom.xml | 2 +-
dubbo-filter/pom.xml | 2 +-
dubbo-monitor/dubbo-monitor-api/pom.xml | 2 +-
dubbo-monitor/dubbo-monitor-default/pom.xml | 2 +-
dubbo-monitor/pom.xml | 2 +-
dubbo-plugin/dubbo-qos/pom.xml | 2 +-
dubbo-plugin/pom.xml | 2 +-
dubbo-registry/dubbo-registry-api/pom.xml | 2 +-
dubbo-registry/dubbo-registry-default/pom.xml | 2 +-
dubbo-registry/dubbo-registry-multicast/pom.xml | 2 +-
dubbo-registry/dubbo-registry-nacos/pom.xml | 2 +-
dubbo-registry/dubbo-registry-redis/pom.xml | 2 +-
dubbo-registry/dubbo-registry-zookeeper/pom.xml | 2 +-
dubbo-registry/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +-
.../dubbo/remoting/transport/AbstractClient.java | 13 +-
.../dispatcher/WrappedChannelHandler.java | 26 ++-
.../handler/WrappedChannelHandlerTest.java | 26 ++-
dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-netty/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +-
dubbo-remoting/dubbo-remoting-zookeeper/pom.xml | 2 +-
.../zookeeper/curator/CuratorZookeeperClient.java | 2 +-
.../zookeeper/support/AbstractZookeeperClient.java | 23 +++
.../zkclient/ZkclientZookeeperClient.java | 2 +-
dubbo-remoting/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-api/pom.xml | 2 +-
.../alibaba/dubbo/rpc/filter/GenericFilter.java | 9 +-
.../dubbo/rpc/proxy/AbstractProxyFactory.java | 2 +-
dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 2 +-
.../protocol/dubbo/telnet/InvokeTelnetHandler.java | 202 ++++++++++++++------
.../protocol/dubbo/telnet/SelectTelnetHandler.java | 59 ++++++
...com.alibaba.dubbo.remoting.telnet.TelnetHandler | 3 +-
.../rpc/protocol/dubbo/support/DemoService.java | 6 +
.../protocol/dubbo/support/DemoServiceImpl.java | 15 ++
.../dubbo/support/{DemoService.java => Man.java} | 53 ++----
.../dubbo/telnet/InvokerTelnetHandlerTest.java | 208 +++++++++++++++-----
.../dubbo/telnet/SelectTelnetHandlerTest.java | 102 ++++++++++
dubbo-rpc/dubbo-rpc-hessian/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +-
.../http/CodebaseAwareObjectInputStream.java | 49 +++++
.../protocol/http/HttpInvokerServiceExporter.java} | 51 ++---
.../dubbo/rpc/protocol/http/HttpProtocol.java | 1 -
dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-rest/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-rmi/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +-
dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +-
dubbo-rpc/pom.xml | 2 +-
.../dubbo-serialization-api/pom.xml | 2 +-
.../dubbo-serialization-fastjson/pom.xml | 2 +-
.../dubbo-serialization-fst/pom.xml | 2 +-
.../dubbo-serialization-hessian2/pom.xml | 2 +-
.../dubbo-serialization-jdk/pom.xml | 2 +-
.../serialize/java/CompactedObjectInputStream.java | 20 ++
.../common/serialize/java/JavaObjectInput.java | 6 +-
.../nativejava/NativeJavaObjectInput.java | 3 +-
.../dubbo-serialization-kryo/pom.xml | 2 +-
dubbo-serialization/pom.xml | 2 +-
dubbo-test/dubbo-test-benchmark/pom.xml | 2 +-
.../dubbo-test-spring3/pom.xml | 2 +-
dubbo-test/dubbo-test-compatibility/pom.xml | 2 +-
dubbo-test/dubbo-test-examples/pom.xml | 2 +-
dubbo-test/dubbo-test-integration/pom.xml | 2 +-
dubbo-test/pom.xml | 4 +-
pom.xml | 4 +-
release.sh | 16 +-
103 files changed, 1133 insertions(+), 302 deletions(-)