various version 2.0 and 2.01 licenses -> 2.02

diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec
index efe547e4522c5e5f18cbb8cb9c4fc0b16020815d..f07f2480d4a04202e0b0fd0d71b4cad362f74821 100644 (file)
--- a/ext/informix/ifx.ec
+++ b/ext/informix/ifx.ec
@@ -4,10 +4,10 @@
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 2.0 of the PHP license,       |
+   | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_0.txt.                                  |
+   | http://www.php.net/license/2_02.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.               |
@@ -20,6 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
 
 /* -------------------------------------------------------------------
  * if you want a function reference : "grep '^\*\*' ifx.ec" will give

diff --git a/ext/java/java.c b/ext/java/java.c
index ab9dcf172e3789114a909572eb449655873bccf8..2157f30dd9c0365cd00caf56ca37b13b6e1e89d9 100644 (file)
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -7,14 +7,16 @@
    | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.php.net/license.html.                                     |
+   | http://www.php.net/license/2_02.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: Sam Ruby (rubys@us.ibm.com)                                  |
    +----------------------------------------------------------------------+
- */
+*/
+
+/* $Id$ */
 
 /*
  * This module implements Zend OO syntax overloading support for Java

diff --git a/ext/java/reflect.java b/ext/java/reflect.java
index 3520b2aba80f5619decdeaabc15933cb4288242d..c45e2fbbfde08e78b22d2fa23fe43e25951eafd5 100644 (file)
--- a/ext/java/reflect.java
+++ b/ext/java/reflect.java
@@ -4,17 +4,19 @@
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 2.0 of the PHP license,       |
+   | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.php.net/license.html.                                     |
+   | http://www.php.net/license/2_02.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: Sam Ruby (rubys@us.ibm.com)                                  |
    +----------------------------------------------------------------------+
- */
+*/
+
+/* $Id$ */
 
 package net.php;
 

diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index ab9dcf172e3789114a909572eb449655873bccf8..2157f30dd9c0365cd00caf56ca37b13b6e1e89d9 100644 (file)
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -7,14 +7,16 @@
    | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.php.net/license.html.                                     |
+   | http://www.php.net/license/2_02.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: Sam Ruby (rubys@us.ibm.com)                                  |
    +----------------------------------------------------------------------+
- */
+*/
+
+/* $Id$ */
 
 /*
  * This module implements Zend OO syntax overloading support for Java

diff --git a/ext/rpc/java/reflect.java b/ext/rpc/java/reflect.java
index 3520b2aba80f5619decdeaabc15933cb4288242d..c45e2fbbfde08e78b22d2fa23fe43e25951eafd5 100644 (file)
--- a/ext/rpc/java/reflect.java
+++ b/ext/rpc/java/reflect.java
@@ -4,17 +4,19 @@
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 2.0 of the PHP license,       |
+   | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.php.net/license.html.                                     |
+   | http://www.php.net/license/2_02.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: Sam Ruby (rubys@us.ibm.com)                                  |
    +----------------------------------------------------------------------+
- */
+*/
+
+/* $Id$ */
 
 package net.php;
 

diff --git a/ext/standard/url_scanner.re b/ext/standard/url_scanner.re
index 23b672bb9c31041c30eeff503ff184dd3707f953..dcc359a54f0d999e3808ecb7ab6e3e8ea0384e01 100644 (file)
--- a/ext/standard/url_scanner.re
+++ b/ext/standard/url_scanner.re
@@ -4,17 +4,18 @@
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 2.0 of the PHP license,       |
+   | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_0.txt.                                  |
+   | http://www.php.net/license/2_02.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: Sascha Schumann <sascha@schumann.cx>                         |
    +----------------------------------------------------------------------+
- */
+*/
+
 /* $Id$ */
 
 #include "php.h"

diff --git a/main/php_content_types.c b/main/php_content_types.c
index e6c85b768576291c03e2f59a9b75c4172985dcc1..a487a3f228c3ff683505d5fd00a548911bec4f0e 100644 (file)
--- a/main/php_content_types.c
+++ b/main/php_content_types.c
@@ -7,15 +7,17 @@
    | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_01.txt.                                 |
+   | http://www.php.net/license/2_02.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.               |
    +----------------------------------------------------------------------+
    | Authors:                                                             |
-   |                                                                      |
    +----------------------------------------------------------------------+
- */
+*/
+
+/* $Id$ */
+
 #include "php.h"
 #include "SAPI.h"
 #include "rfc1867.h"

diff --git a/main/php_ticks.c b/main/php_ticks.c
index 7f53ef3741b04d03a901028f01316f355883468a..bb6ac715bbe6992da5d221303343a4401d9d9eb0 100644 (file)
--- a/main/php_ticks.c
+++ b/main/php_ticks.c
@@ -4,18 +4,19 @@
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 2.0 of the PHP license,       |
+   | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_0.txt.                                  |
+   | http://www.php.net/license/2_02.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.               |
    +----------------------------------------------------------------------+
    | Authors: Stig Bakken <ssb@fast.no>                                   |
-   |                                                                      |
    +----------------------------------------------------------------------+
- */
+*/
+
+/* $Id$ */
 
 #include "php.h"
 #include "php_ticks.h"

diff --git a/main/php_ticks.h b/main/php_ticks.h
index 6d4bd780464ad3ae6711e33224a9b992e3cd3620..078ca3aae2881dfac7092f516e11a13c84837723 100644 (file)
--- a/main/php_ticks.h
+++ b/main/php_ticks.h
@@ -4,18 +4,19 @@
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 2.0 of the PHP license,       |
+   | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_0.txt.                                  |
+   | http://www.php.net/license/2_02.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.               |
    +----------------------------------------------------------------------+
    | Authors: Stig Bakken <ssb@fast.no>                                   |
-   |                                                                      |
    +----------------------------------------------------------------------+
- */
+*/
+
+/* $Id$ */
 
 #ifndef PHP_TICKS_H
 #define PHP_TICKS_H

diff --git a/main/php_virtual_cwd.c b/main/php_virtual_cwd.c
index 0e39587f389640ff84732cf0a172300768a25162..a248bea38da195d81ada6f37f67410eb1e219f28 100644 (file)
--- a/main/php_virtual_cwd.c
+++ b/main/php_virtual_cwd.c
@@ -4,7 +4,7 @@
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 2.01 of the PHP license,      |
+   | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
    | http://www.php.net/license/2_02.txt.                                 |
@@ -17,6 +17,8 @@
    +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>

diff --git a/main/php_virtual_cwd.h b/main/php_virtual_cwd.h
index a8583188284d67e73824a00f1d5a9c223537bcc8..239c0a0733be61b58bf82b85bd6c9a15c25161c9 100644 (file)
--- a/main/php_virtual_cwd.h
+++ b/main/php_virtual_cwd.h
@@ -4,7 +4,7 @@
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 2.01 of the PHP license,      |
+   | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
    | http://www.php.net/license/2_02.txt.                                 |
@@ -17,6 +17,8 @@
    +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
+
 #ifndef VIRTUAL_CWD_H
 #define VIRTUAL_CWD_H
 

diff --git a/pear/DB.php b/pear/DB.php
index f016d48e4bdd0cee53100867a935b4d09acea487..a9e5e629431b70e1a8886c1cc91478e37d663462 100644 (file)
--- a/pear/DB.php
+++ b/pear/DB.php
@@ -5,10 +5,10 @@
 // +----------------------------------------------------------------------+
 // | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
 // +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license,       |
+// | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
 // | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_0.txt.                                  |
+// | http://www.php.net/license/2_02.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.               |

diff --git a/pear/HTTP.php b/pear/HTTP.php
index 9b866dd78efa37634611e7c95e44e93dede8efdc..b66554925b289d67c2ce47caf3d6667aeb1f9f13 100644 (file)
--- a/pear/HTTP.php
+++ b/pear/HTTP.php
@@ -5,10 +5,10 @@
 // +----------------------------------------------------------------------+
 // | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
 // +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license,       |
+// | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
 // | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_0.txt.                                  |
+// | http://www.php.net/license/2_02.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.               |

diff --git a/pear/PEAR_Error.php b/pear/PEAR_Error.php
index 8f7762920a0595a95197a4c2cb5d9ba8bbbe9624..42ebc554c6c3e93607e4c69dfd9158b6041e0b8d 100644 (file)
--- a/pear/PEAR_Error.php
+++ b/pear/PEAR_Error.php
@@ -5,10 +5,10 @@
 // +----------------------------------------------------------------------+
 // | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
 // +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license,       |
+// | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
 // | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_0.txt.                                  |
+// | http://www.php.net/license/2_02.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.               |

diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c
index b8f515d452bd4a96fca919f9dfbba2771b9ec597..c6a6f839b0cd956e5b1485a2da07b159a7958645 100644 (file)
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -4,10 +4,10 @@
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 2.0 of the PHP license,       |
+   | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_0.txt.                                  |
+   | http://www.php.net/license/2_02.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.               |
@@ -20,9 +20,7 @@
    +----------------------------------------------------------------------+
  */
 
-/*
-** $Id$
-*/
+/* $Id$ */
 
 #if WIN32|WINNT
 #  include <windows.h>

diff --git a/sapi/servlet/formatter.java b/sapi/servlet/formatter.java
index 7e4605f70c2bc34552f676105f6b307c2daa8064..a0d39cbe8cad66b6d7ece157914c7bbfeb39d4d6 100644 (file)
--- a/sapi/servlet/formatter.java
+++ b/sapi/servlet/formatter.java
@@ -4,10 +4,10 @@
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 2.0 of the PHP license,       |
+   | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_0.txt.                                  |
+   | http://www.php.net/license/2_02.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.               |
@@ -16,6 +16,8 @@
    +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
+
 package net.php;
 
 import javax.servlet.*;

diff --git a/sapi/servlet/servlet.java b/sapi/servlet/servlet.java
index 6b10c268bc852f6810e2a05a1ac520fa7d988a24..3ed5e1922271fa16961d7bb8fd9c26c01b83d954 100644 (file)
--- a/sapi/servlet/servlet.java
+++ b/sapi/servlet/servlet.java
@@ -4,10 +4,10 @@
    +----------------------------------------------------------------------+
    | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 2.0 of the PHP license,       |
+   | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
    | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_0.txt.                                  |
+   | http://www.php.net/license/2_02.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.               |
@@ -16,6 +16,8 @@
    +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
+
 package net.php;
 
 import java.io.IOException;