From: Roger Meier Date: Tue, 12 Apr 2011 19:23:10 +0000 (+0000) Subject: THRIFT-1136 C++ SSL implementation cleanup X-Git-Tag: 0.7.0~116 X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=0ae0542152c1a37b8beb0ae9615ce824cd4241a4;p=common%2Fthrift.git THRIFT-1136 C++ SSL implementation cleanup git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1091553 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/README.SSL b/lib/cpp/README.SSL similarity index 100% rename from README.SSL rename to lib/cpp/README.SSL diff --git a/lib/cpp/src/transport/TSSLServerSocket.cpp b/lib/cpp/src/transport/TSSLServerSocket.cpp index ed4b648b..8e06f306 100644 --- a/lib/cpp/src/transport/TSSLServerSocket.cpp +++ b/lib/cpp/src/transport/TSSLServerSocket.cpp @@ -1,8 +1,21 @@ -// Copyright (c) 2009- Facebook -// Distributed under the Thrift Software License -// -// See accompanying file LICENSE or visit the Thrift site at: -// http://developers.facebook.com/thrift/ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ #include "TSSLServerSocket.h" #include "TSSLSocket.h" @@ -13,8 +26,6 @@ using namespace boost; /** * SSL server socket implementation. - * - * @author Ping Li */ TSSLServerSocket::TSSLServerSocket(int port, shared_ptr factory): diff --git a/lib/cpp/src/transport/TSSLServerSocket.h b/lib/cpp/src/transport/TSSLServerSocket.h index 36f895ca..a4e659db 100644 --- a/lib/cpp/src/transport/TSSLServerSocket.h +++ b/lib/cpp/src/transport/TSSLServerSocket.h @@ -1,8 +1,21 @@ -// Copyright (c) 2009- Facebook -// Distributed under the Thrift Software License -// -// See accompanying file LICENSE or visit the Thrift site at: -// http://developers.facebook.com/thrift/ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ #ifndef _THRIFT_TRANSPORT_TSSLSERVERSOCKET_H_ #define _THRIFT_TRANSPORT_TSSLSERVERSOCKET_H_ 1 @@ -16,8 +29,6 @@ class TSSLSocketFactory; /** * Server socket that accepts SSL connections. - * - * @author Ping Li */ class TSSLServerSocket: public TServerSocket { public: diff --git a/lib/cpp/src/transport/TSSLSocket.cpp b/lib/cpp/src/transport/TSSLSocket.cpp index c8a3b25b..602a8945 100644 --- a/lib/cpp/src/transport/TSSLSocket.cpp +++ b/lib/cpp/src/transport/TSSLSocket.cpp @@ -1,8 +1,21 @@ -// Copyright (c) 2009- Facebook -// Distributed under the Thrift Software License -// -// See accompanying file LICENSE or visit the Thrift site at: -// http://developers.facebook.com/thrift/ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ #include #include diff --git a/lib/cpp/src/transport/TSSLSocket.h b/lib/cpp/src/transport/TSSLSocket.h index 58e39345..6b241b21 100644 --- a/lib/cpp/src/transport/TSSLSocket.h +++ b/lib/cpp/src/transport/TSSLSocket.h @@ -1,8 +1,21 @@ -// Copyright (c) 2009- Facebook -// Distributed under the Thrift Software License -// -// See accompanying file LICENSE or visit the Thrift site at: -// http://developers.facebook.com/thrift/ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ #ifndef _THRIFT_TRANSPORT_TSSLSOCKET_H_ #define _THRIFT_TRANSPORT_TSSLSOCKET_H_ 1 @@ -20,8 +33,6 @@ class SSLContext; /** * OpenSSL implementation for SSL socket interface. - * - * @author Ping Li */ class TSSLSocket: public TSocket { public: