Skip to content

Commit

Permalink
Merge pull request #64 from deminy/apache-2
Browse files Browse the repository at this point in the history
use the Apache 2 license
  • Loading branch information
matyhtf authored Sep 24, 2019
2 parents 4cfa1fa + 202f541 commit 8762b4b
Show file tree
Hide file tree
Showing 13 changed files with 37 additions and 61 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# PHP-X

[![Build Status](https://api.travis-ci.org/swoole/phpx.svg)](https://travis-ci.org/swoole/phpx)
[![License](https://img.shields.io/badge/license-GPL3.0-blue.svg)](LICENSE)
[![License](https://img.shields.io/badge/license-apache2-blue.svg)](LICENSE)

C++ wrapper for Zend API

Expand Down
8 changes: 3 additions & 5 deletions include/phpx.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
+----------------------------------------------------------------------+
| PHP-X |
+----------------------------------------------------------------------+
| Copyright (c) 2016-2017 The Swoole Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the GPL license, |
| This source file is subject to version 2.0 of the Apache license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.gnu.org/licenses/ |
| If you did not receive a copy of the GPL3.0 license and are unable |
| http://www.apache.org/licenses/LICENSE-2.0.html |
| If you did not receive a copy of the Apache2.0 license and are unable|
| to obtain it through the world-wide-web, please send a note to |
| license@swoole.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
Expand Down
8 changes: 3 additions & 5 deletions include/phpx_embed.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
+----------------------------------------------------------------------+
| PHP-X |
+----------------------------------------------------------------------+
| Copyright (c) 2016-2017 The Swoole Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the GPL license, |
| This source file is subject to version 2.0 of the Apache license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.gnu.org/licenses/ |
| If you did not receive a copy of the GPL3.0 license and are unable |
| http://www.apache.org/licenses/LICENSE-2.0.html |
| If you did not receive a copy of the Apache2.0 license and are unable|
| to obtain it through the world-wide-web, please send a note to |
| license@swoole.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
Expand Down
8 changes: 3 additions & 5 deletions src/array.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
+----------------------------------------------------------------------+
| PHP-X |
+----------------------------------------------------------------------+
| Copyright (c) 2016-2017 The Swoole Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the GPL license, |
| This source file is subject to version 2.0 of the Apache license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.gnu.org/licenses/ |
| If you did not receive a copy of the GPL3.0 license and are unable |
| http://www.apache.org/licenses/LICENSE-2.0.html |
| If you did not receive a copy of the Apache2.0 license and are unable|
| to obtain it through the world-wide-web, please send a note to |
| license@swoole.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
Expand Down
8 changes: 3 additions & 5 deletions src/base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
+----------------------------------------------------------------------+
| PHP-X |
+----------------------------------------------------------------------+
| Copyright (c) 2016-2017 The Swoole Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the GPL license, |
| This source file is subject to version 2.0 of the Apache license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.gnu.org/licenses/ |
| If you did not receive a copy of the GPL3.0 license and are unable |
| http://www.apache.org/licenses/LICENSE-2.0.html |
| If you did not receive a copy of the Apache2.0 license and are unable|
| to obtain it through the world-wide-web, please send a note to |
| license@swoole.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
Expand Down
8 changes: 3 additions & 5 deletions src/class.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
+----------------------------------------------------------------------+
| PHP-X |
+----------------------------------------------------------------------+
| Copyright (c) 2016-2017 The Swoole Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the GPL license, |
| This source file is subject to version 2.0 of the Apache license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.gnu.org/licenses/ |
| If you did not receive a copy of the GPL3.0 license and are unable |
| http://www.apache.org/licenses/LICENSE-2.0.html |
| If you did not receive a copy of the Apache2.0 license and are unable|
| to obtain it through the world-wide-web, please send a note to |
| license@swoole.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
Expand Down
8 changes: 3 additions & 5 deletions src/exec.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
+----------------------------------------------------------------------+
| PHP-X |
+----------------------------------------------------------------------+
| Copyright (c) 2016-2017 The Swoole Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the GPL license, |
| This source file is subject to version 2.0 of the Apache license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.gnu.org/licenses/ |
| If you did not receive a copy of the GPL3.0 license and are unable |
| http://www.apache.org/licenses/LICENSE-2.0.html |
| If you did not receive a copy of the Apache2.0 license and are unable|
| to obtain it through the world-wide-web, please send a note to |
| license@swoole.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
Expand Down
8 changes: 3 additions & 5 deletions src/extension.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
+----------------------------------------------------------------------+
| PHP-X |
+----------------------------------------------------------------------+
| Copyright (c) 2016-2017 The Swoole Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the GPL license, |
| This source file is subject to version 2.0 of the Apache license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.gnu.org/licenses/ |
| If you did not receive a copy of the GPL3.0 license and are unable |
| http://www.apache.org/licenses/LICENSE-2.0.html |
| If you did not receive a copy of the Apache2.0 license and are unable|
| to obtain it through the world-wide-web, please send a note to |
| license@swoole.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
Expand Down
8 changes: 3 additions & 5 deletions src/function.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
+----------------------------------------------------------------------+
| PHP-X |
+----------------------------------------------------------------------+
| Copyright (c) 2016-2017 The Swoole Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the GPL license, |
| This source file is subject to version 2.0 of the Apache license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.gnu.org/licenses/ |
| If you did not receive a copy of the GPL3.0 license and are unable |
| http://www.apache.org/licenses/LICENSE-2.0.html |
| If you did not receive a copy of the Apache2.0 license and are unable|
| to obtain it through the world-wide-web, please send a note to |
| license@swoole.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
Expand Down
8 changes: 3 additions & 5 deletions src/hash.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
+----------------------------------------------------------------------+
| PHP-X |
+----------------------------------------------------------------------+
| Copyright (c) 2016-2017 The Swoole Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the GPL license, |
| This source file is subject to version 2.0 of the Apache license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.gnu.org/licenses/ |
| If you did not receive a copy of the GPL3.0 license and are unable |
| http://www.apache.org/licenses/LICENSE-2.0.html |
| If you did not receive a copy of the Apache2.0 license and are unable|
| to obtain it through the world-wide-web, please send a note to |
| license@swoole.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
Expand Down
8 changes: 3 additions & 5 deletions src/object.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
+----------------------------------------------------------------------+
| PHP-X |
+----------------------------------------------------------------------+
| Copyright (c) 2016-2017 The Swoole Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the GPL license, |
| This source file is subject to version 2.0 of the Apache license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.gnu.org/licenses/ |
| If you did not receive a copy of the GPL3.0 license and are unable |
| http://www.apache.org/licenses/LICENSE-2.0.html |
| If you did not receive a copy of the Apache2.0 license and are unable|
| to obtain it through the world-wide-web, please send a note to |
| license@swoole.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
Expand Down
8 changes: 3 additions & 5 deletions src/string.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
+----------------------------------------------------------------------+
| PHP-X |
+----------------------------------------------------------------------+
| Copyright (c) 2016-2017 The Swoole Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the GPL license, |
| This source file is subject to version 2.0 of the Apache license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.gnu.org/licenses/ |
| If you did not receive a copy of the GPL3.0 license and are unable |
| http://www.apache.org/licenses/LICENSE-2.0.html |
| If you did not receive a copy of the Apache2.0 license and are unable|
| to obtain it through the world-wide-web, please send a note to |
| license@swoole.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
Expand Down
8 changes: 3 additions & 5 deletions src/variant.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
+----------------------------------------------------------------------+
| PHP-X |
+----------------------------------------------------------------------+
| Copyright (c) 2016-2017 The Swoole Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 of the GPL license, |
| This source file is subject to version 2.0 of the Apache license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.gnu.org/licenses/ |
| If you did not receive a copy of the GPL3.0 license and are unable |
| http://www.apache.org/licenses/LICENSE-2.0.html |
| If you did not receive a copy of the Apache2.0 license and are unable|
| to obtain it through the world-wide-web, please send a note to |
| license@swoole.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
Expand Down

0 comments on commit 8762b4b

Please sign in to comment.