[incubator-servicecomb-service-center] branch master updated: SCB-317 Update the cors license (#273)

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

littlecui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
     new 6e1bb00  SCB-317 Update the cors license (#273)
6e1bb00 is described below

commit 6e1bb00c82daf8b55a1a348c66a652faafb3f778
Author: Mohammad Asif Siddiqui <mo...@huawei.com>
AuthorDate: Mon Feb 5 11:38:51 2018 +0530

    SCB-317 Update the cors license (#273)
    
    * Update the cors license
    
    * Update cors.go
    
    * Update cors.go
---
 NOTICE                          | 14 ++++++++++++++
 server/interceptor/cors/cors.go | 37 ++++++++++++++++++++++---------------
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/NOTICE b/NOTICE
index 7fe2cb6..5111231 100644
--- a/NOTICE
+++ b/NOTICE
@@ -36,6 +36,7 @@ The following components are provided under the  MIT License  (http://www.openso
 github.com/beorn7/perks/quantile
 github.com/boltdb/bolt
 github.com/satori/go.uuid
+github.com/rs/cors
 AngularJS v1.6.6 (http://angularjs.org)
 Bootstrap v3.3.7 (http://getbootstrap.com)
 Chart.js (https://github.com/chartjs/Chart.js)
@@ -192,3 +193,16 @@ Copyright 2014-2015 The Prometheus Authors
 
 This product includes software developed at
 SoundCloud Ltd. (http://soundcloud.com/).
+
+================================================================
+
+Notice for rs/cors
+
+rs/cors provides functions to allow CORS for http request, some part
+of the code was used and modified as per the use case.
+
+Credit to :
+
+Copyright (c) 2014 Olivier Poitrey <rs...@dailymotion.com>
+
+Licensed under MIT
diff --git a/server/interceptor/cors/cors.go b/server/interceptor/cors/cors.go
index 5dd39c5..e0c60ed 100644
--- a/server/interceptor/cors/cors.go
+++ b/server/interceptor/cors/cors.go
@@ -1,19 +1,26 @@
 /*
- * 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.
- */
+ Copyright (c) 2014 Olivier Poitrey <rs...@dailymotion.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+The original code was modified to fit the Service-Center use case.
+  */
 package cors
 
 import (

-- 
To stop receiving notification emails like this one, please contact
littlecui@apache.org.