Skip to content

Commit

Permalink
license: add license headers.
Browse files Browse the repository at this point in the history
  • Loading branch information
moonming committed Jul 24, 2020
1 parent 0758287 commit 888ac87
Show file tree
Hide file tree
Showing 7 changed files with 101 additions and 31 deletions.
19 changes: 18 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright 2019-2020 Shenzhen ZhiLiu Technology Co., Ltd. https://www.apiseven.com

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -199,3 +199,20 @@
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.

=======================================================================
lua-resty-radixtree Subcomponents:

The lua-resty-radixtree project contains subcomponents with separate copyright
notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following
licenses.

========================================================================
BSD licenses
========================================================================

The following components are provided under a BSD license. See project link for details.
The text of each license is also included at licenses/LICENSE-[project].txt.

rax files from https://github.com/antirez/rax BSD-2-Clause License
3 changes: 3 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
https://github.com/api7/lua-resty-radixtree
Copyright 2019-2020 Shenzhen ZhiLiu Technology Co., Ltd.
https://www.apiseven.com
33 changes: 21 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
# Table of Contents

* [Name](#name)
* [Status](#status)
* [Synopsis](#synopsis)
* [Methods](#methods)
* [new](#new)
* [match](#match)
* [dispatch](#dispatch)
* [Install](#install)
* [DEV ENV](#dev-env)
* [Benchmark](#benchmark)
- [Table of Contents](#table-of-contents)
- [Name](#name)
- [Synopsis](#synopsis)
- [Methods](#methods)
- [new](#new)
- [Path](#path)
- [Full path match](#full-path-match)
- [Prefix match](#prefix-match)
- [Parameters in path](#parameters-in-path)
- [Operator List](#operator-list)
- [match](#match)
- [dispatch](#dispatch)
- [Install](#install)
- [Compile and install](#compile-and-install)
- [DEV ENV](#dev-env)
- [Install Dependencies](#install-dependencies)
- [Benchmark](#benchmark)

## Name

This is Lua-Openresty implementation library base on FFI for [rax](https://github.com/antirez/rax).
This is Lua implementation library base on FFI for [rax](https://github.com/antirez/rax).

[![Build Status](https://travis-ci.org/iresty/lua-resty-radixtree.svg?branch=master)](https://travis-ci.org/iresty/lua-resty-radixtree)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/iresty/lua-resty-radixtree/blob/master/LICENSE)
Expand All @@ -22,7 +29,9 @@ This project depends on [lua-resty-ipmatcher](https://github.com/iresty/lua-rest

This project has been working in microservices API gateway [Apache APISIX](https://github.com/apache/incubator-apisix).

The project is open sourced by Shenzhen [ZhiLiu](https://www.iresty.com/) Technology Company. In addition to this open source version, our company also provides a more powerful and performing commercial version, and provides technical support. If you are interested in our commercial version, please contact us. email: [[email protected]]([email protected]) .
The project is open sourced by [Shenzhen ZhiLiu](https://www.apiseven.com/) Technology Co., Ltd.

In addition to this open source version, our company also provides a more powerful and performing commercial version, and provides technical support. If you are interested in our commercial version, please [contact us](https://www.apiseven.com/).

## Synopsis

Expand Down
20 changes: 19 additions & 1 deletion lib/resty/radixtree.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
-- Copyright (C) Yuansheng Wang
-- https://github.com/api7/lua-resty-radixtree
--
-- Copyright 2019-2020 Shenzhen ZhiLiu Technology Co., Ltd.
-- https://www.apiseven.com
--
-- See the NOTICE file distributed with
-- this work for additional information regarding copyright ownership.
-- The owner licenses this file to You under the Apache License, Version 2.0;
-- 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.
--

local ipmatcher = require("resty.ipmatcher")
local base = require("resty.core.base")
Expand Down
17 changes: 0 additions & 17 deletions COPYRIGHT → licenses/LICENSE-rax.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
%%%%%%%%%

Library

Repo URL
License URL

License text


%%%%%%%%%

rax
https://github.com/antirez/rax
https://github.com/antirez/rax/blob/master/COPYING

Copyright (c) 2017, Salvatore Sanfilippo <[email protected]>
All rights reserved.

Expand All @@ -24,4 +8,3 @@ Redistribution and use in source and binary forms, with or without modification,

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

%%%%%%%%%
20 changes: 20 additions & 0 deletions src/easy_rax.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
/* https://github.com/api7/lua-resty-radixtree
*
* Copyright 2019-2020 Shenzhen ZhiLiu Technology Co., Ltd.
* https://www.apiseven.com
*
* See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The owner licenses this file to You under the Apache License, Version 2.0;
* 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 <stdlib.h>
#include <string.h>
#include <netinet/in.h>
Expand Down
20 changes: 20 additions & 0 deletions src/easy_rax.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
/* https://github.com/api7/lua-resty-radixtree
*
* Copyright 2019-2020 Shenzhen ZhiLiu Technology Co., Ltd.
* https://www.apiseven.com
*
* See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The owner licenses this file to You under the Apache License, Version 2.0;
* 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 LUA_RESTY_RADIXTREE_H
#define LUA_RESTY_RADIXTREE_H

Expand Down

0 comments on commit 888ac87

Please sign in to comment.