You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/06/02 06:04:22 UTC
[42/46] incubator-weex git commit: * [ios] move SRWebSocket's header
back to BSD license
* [ios] move SRWebSocket's header back to BSD license
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a0d25dc9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a0d25dc9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a0d25dc9
Branch: refs/heads/master
Commit: a0d25dc98471de1bd783f3d2944a649ca385b317
Parents: 553c1f5
Author: yinfeng <cx...@apache.org>
Authored: Thu Jun 1 14:57:32 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Thu Jun 1 14:57:32 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/dependency/SRWebSocket.h | 17 ++++++-----------
ios/sdk/WeexSDK/dependency/SRWebSocket.m | 18 ++++++------------
2 files changed, 12 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a0d25dc9/ios/sdk/WeexSDK/dependency/SRWebSocket.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/dependency/SRWebSocket.h b/ios/sdk/WeexSDK/dependency/SRWebSocket.h
index 5f8bca1..094a39d 100644
--- a/ios/sdk/WeexSDK/dependency/SRWebSocket.h
+++ b/ios/sdk/WeexSDK/dependency/SRWebSocket.h
@@ -1,17 +1,12 @@
//
-// Copyright 2012 Square Inc.
+// Copyright 2012 Square Inc.
+// Portions Copyright (c) 2016-present, Facebook, Inc.
//
-// Licensed 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
+// All rights reserved.
//
-// 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.
+// This source code is licensed under the BSD-style license found in the
+// LICENSE file in the root directory of this source tree. An additional grant
+// of patent rights can be found in the PATENTS file in the same directory.
//
#import <Foundation/Foundation.h>
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a0d25dc9/ios/sdk/WeexSDK/dependency/SRWebSocket.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/dependency/SRWebSocket.m b/ios/sdk/WeexSDK/dependency/SRWebSocket.m
index 3ba577b..03ad557 100644
--- a/ios/sdk/WeexSDK/dependency/SRWebSocket.m
+++ b/ios/sdk/WeexSDK/dependency/SRWebSocket.m
@@ -1,19 +1,13 @@
//
-// Copyright 2012 Square Inc.
+// Copyright 2012 Square Inc.
+// Portions Copyright (c) 2016-present, Facebook, Inc.
//
-// Licensed 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
+// All rights reserved.
//
-// http://www.apache.org/licenses/LICENSE-2.0
+// This source code is licensed under the BSD-style license found in the
+// LICENSE file in the root directory of this source tree. An additional grant
+// of patent rights can be found in the PATENTS file in the same directory.
//
-// 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.
-//
-
#import "SRWebSocket.h"