summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/informix/ifx.ec5
-rw-r--r--ext/java/java.c6
-rw-r--r--ext/java/reflect.java8
-rw-r--r--ext/rpc/java/java.c6
-rw-r--r--ext/rpc/java/reflect.java8
-rw-r--r--ext/standard/url_scanner.re7
-rw-r--r--main/php_content_types.c8
-rw-r--r--main/php_ticks.c9
-rw-r--r--main/php_ticks.h9
-rw-r--r--main/php_virtual_cwd.c4
-rw-r--r--main/php_virtual_cwd.h4
-rw-r--r--pear/DB.php4
-rw-r--r--pear/HTTP.php4
-rw-r--r--pear/PEAR_Error.php4
-rw-r--r--sapi/pi3web/pi3web_sapi.c8
-rw-r--r--sapi/servlet/formatter.java6
-rw-r--r--sapi/servlet/servlet.java6
17 files changed, 63 insertions, 43 deletions
diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec
index efe547e452..f07f2480d4 100644
--- 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 ab9dcf172e..2157f30dd9 100644
--- 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 3520b2aba8..c45e2fbbfd 100644
--- 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 ab9dcf172e..2157f30dd9 100644
--- 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 3520b2aba8..c45e2fbbfd 100644
--- 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 23b672bb9c..dcc359a54f 100644
--- 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 e6c85b7685..a487a3f228 100644
--- 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 7f53ef3741..bb6ac715bb 100644
--- 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 6d4bd78046..078ca3aae2 100644
--- 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 0e39587f38..a248bea38d 100644
--- 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 a858318828..239c0a0733 100644
--- 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 f016d48e4b..a9e5e62943 100644
--- 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 9b866dd78e..b66554925b 100644
--- 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 8f7762920a..42ebc554c6 100644
--- 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 b8f515d452..c6a6f839b0 100644
--- 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 7e4605f70c..a0d39cbe8c 100644
--- 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 6b10c268bc..3ed5e19222 100644
--- 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;
View Lorry Controller Status