summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmar Kilani <omar@php.net>2006-01-21 01:14:14 +0000
committerOmar Kilani <omar@php.net>2006-01-21 01:14:14 +0000
commit428bce101a473c9c8c0a532e123336d666f2cabf (patch)
treeee1abbc233a9929e400d215065a5c15b2a17a898
parent644ca8810095c28eca47cb8b7d3a8d6855131148 (diff)
downloadphp-git-428bce101a473c9c8c0a532e123336d666f2cabf.tar.gz
Change license from LGPL to PHP.
-rw-r--r--ext/json/json.c29
-rw-r--r--ext/json/package.xml2
-rw-r--r--ext/json/php_json.h31
3 files changed, 34 insertions, 28 deletions
diff --git a/ext/json/json.c b/ext/json/json.c
index 5edacc3262..a50e72000f 100644
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -1,17 +1,20 @@
/*
- * Copyright (c) 2005 Omar Kilani <omar@rmilk.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public (LGPL)
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details: http://www.gnu.org/
- *
- */
+ +----------------------------------------------------------------------+
+ | PHP Version 5 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2006 The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.01 of the PHP 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.php.net/license/3_01.txt |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | license@php.net so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Omar Kilani <omar@rmilk.com> |
+ +----------------------------------------------------------------------+
+*/
/* $Id$ */
diff --git a/ext/json/package.xml b/ext/json/package.xml
index 7459f26122..9778040eac 100644
--- a/ext/json/package.xml
+++ b/ext/json/package.xml
@@ -19,7 +19,7 @@
<release>
<state>stable</state>
<version>1.1.1</version>
- <date>2005-12-11</date>
+ <date>2006-01-12</date>
<notes>
Cleanup and TSRM performance fixes by rasmus.
</notes>
diff --git a/ext/json/php_json.h b/ext/json/php_json.h
index 60ca42c956..4408c0ec5a 100644
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -1,24 +1,27 @@
/*
- * Copyright (c) 2005 Omar Kilani <omar@rmilk.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public (LGPL)
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details: http://www.gnu.org/
- *
- */
+ +----------------------------------------------------------------------+
+ | PHP Version 5 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2006 The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.01 of the PHP 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.php.net/license/3_01.txt |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | license@php.net so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Omar Kilani <omar@rmilk.com> |
+ +----------------------------------------------------------------------+
+*/
/* $Id$ */
#ifndef PHP_JSON_H
#define PHP_JSON_H
-#define PHP_JSON_VERSION "1.1.0"
+#define PHP_JSON_VERSION "1.1.1"
extern zend_module_entry json_module_entry;
#define phpext_json_ptr &json_module_entry