ws fixes + missing $Id$ tags, headers added

diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h
index c1d1e0c232ac2f44c543d9c675d15e5f8d49b780..b573745797f63127c3bfacad423c3b7bf90550ab 100644 (file)
--- a/ext/ereg/php_regex.h
+++ b/ext/ereg/php_regex.h
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 #ifndef PHP_REGEX_H
 #define PHP_REGEX_H
 

diff --git a/main/SAPI.h b/main/SAPI.h
index 75c80fae41af861e4a691800e031c4313f33cf13..4ecc77a8b23fe6686de2adb345be3ad1ab15e39a 100644 (file)
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -16,6 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
 
 #ifndef SAPI_H
 #define SAPI_H

diff --git a/main/alloca.c b/main/alloca.c
index 65e3f7f5e9b36a587f8c0ce488c60af6c0133ace..ae28159913ae0eac1020003ecb265526535e174a 100644 (file)
--- a/main/alloca.c
+++ b/main/alloca.c
@@ -21,6 +21,8 @@
    allocating any.  It is a good idea to use alloca(0) in
    your main control loop, etc. to force garbage collection.  */
 
+/* $Id$ */
+
 #include "php_config.h"
 
 #if !HAVE_ALLOCA

diff --git a/main/config.nw.h b/main/config.nw.h
index c05fefc2011486e8bfe9081c236f198615b7cb2b..e7b392ee1df93db4ba4be1fbc9738c0fb3e61b17 100644 (file)
--- a/main/config.nw.h
+++ b/main/config.nw.h
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 /* config.nw.h.  Configure file for NetWare platform */
 
 

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index d1c9f570070e732bdbf1b9ee928308d84027f697..831d11a9ef2f53d49567a5002e323ae4ff4adbbc 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -16,6 +16,7 @@
    |          Jim Winstead <jimw@php.net>                                 |
    +----------------------------------------------------------------------+
  */
+
 /* $Id$ */
 
 /* {{{ includes

diff --git a/main/fopen_wrappers.h b/main/fopen_wrappers.h
index 42244e84a64d980fff44d20fb104143d6fe255e4..331360c2673db16cf12e8c9c449cfab8c5afeab6 100644 (file)
--- a/main/fopen_wrappers.h
+++ b/main/fopen_wrappers.h
@@ -15,6 +15,7 @@
    | Author: Jim Winstead <jimw@php.net>                                  |
    +----------------------------------------------------------------------+
  */
+
 /* $Id$ */
 
 #ifndef FOPEN_WRAPPERS_H

diff --git a/main/internal_functions.c.in b/main/internal_functions.c.in
index 4903d6c4bb052fe5089a6c56d99a441712227182..2af72800ac7dd551a111bf25388d1915fc2e35aa 100644 (file)
--- a/main/internal_functions.c.in
+++ b/main/internal_functions.c.in
@@ -17,7 +17,6 @@
    +----------------------------------------------------------------------+
  */
 
-
 /* $Id$ */
 
 #include "php.h"

diff --git a/main/internal_functions_nw.c b/main/internal_functions_nw.c
index e133fc42c521cb19db4ca199eb33b331b94c1c41..6d83ae60a241480b36397f06b201b8a5db51ae3c 100644 (file)
--- a/main/internal_functions_nw.c
+++ b/main/internal_functions_nw.c
@@ -18,6 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
+/* $Id$ */
 
 /* {{{ includes
  */

diff --git a/main/internal_functions_registry.h b/main/internal_functions_registry.h
index b0c3b6e51d127ce07b53d7deb8e97b1599267749..60b254893a8d2d95ae590be9879818e1680b1339 100644 (file)
--- a/main/internal_functions_registry.h
+++ b/main/internal_functions_registry.h
@@ -17,7 +17,6 @@
    +----------------------------------------------------------------------+
  */
 
-
 /* $Id$ */
 
 #ifndef INTERNAL_FUNCTIONS_REGISTRY_H

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 73d1a25d4efdc31ed7f783640e553cda39140aaa..69d8cab17757131bfa5522151a050757cfc3a98d 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -15,10 +15,10 @@
        | Authors: Andi Gutmans <andi@zend.com>                                |
        |          Zeev Suraski <zeev@zend.com>                                |
        +----------------------------------------------------------------------+
-
-       $Id$
 */
 
+/* $Id$ */
+
 /* {{{ includes
  */
 #include "php.h"

diff --git a/main/logos.h b/main/logos.h
index 3711c0e8a3294c7277cab9fe959fc85ab7cc9cde..4425dcec0947f6fdfb0a1d7dc62a789676c9be5f 100644 (file)
--- a/main/logos.h
+++ b/main/logos.h
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 #define CONTEXT_TYPE_IMAGE_GIF "Content-Type:  image/gif"
 
 unsigned char zend_logo[] = {

diff --git a/main/mergesort.c b/main/mergesort.c
index 34da44cf2f7f597c9499aa8a56ee30b962689a39..117f859e945b5bc63c9d3d87069aa8d56f5cb5c2 100644 (file)
--- a/main/mergesort.c
+++ b/main/mergesort.c
@@ -34,6 +34,8 @@
  * SUCH DAMAGE.
  */
 
+/* $Id$ */
+
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)merge.c    8.2 (Berkeley) 2/14/94";
 #endif /* LIBC_SCCS and not lint */

diff --git a/main/network.c b/main/network.c
index 34b46f7a36f880bd008ac05091ee3a4be6b8f27a..cf96982e6bbb02153dfd0c0818f2aa73b39c3b6d 100644 (file)
--- a/main/network.c
+++ b/main/network.c
@@ -16,6 +16,7 @@
    | Streams work by Wez Furlong <wez@thebrainroom.com>                   |
    +----------------------------------------------------------------------+
  */
+
 /* $Id$ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/

diff --git a/main/php3_compat.h b/main/php3_compat.h
index 4093a79a906346e386acf3311a3068c2da61a970..be0758e34df09d8176605e6825e4e883f06b18f6 100644 (file)
--- a/main/php3_compat.h
+++ b/main/php3_compat.h
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 #ifndef PHP3_COMPAT_H
 #define PHP3_COMPAT_H
 

diff --git a/main/php_compat.h b/main/php_compat.h
index f934b0792518da489fe14a070696751ceca9e9ea..a9ab40550f29de9b40b2b03f6db65aab6434405b 100644 (file)
--- a/main/php_compat.h
+++ b/main/php_compat.h
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
 

diff --git a/main/php_content_types.h b/main/php_content_types.h
index ea36d53df6ce8cfbd4545b25d4bf55321def62d5..27f8c3fe622e2cb90937b1d9a12d8c8f82ae0eb3 100644 (file)
--- a/main/php_content_types.h
+++ b/main/php_content_types.h
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 #ifndef PHP_CONTENT_TYPES_H
 #define PHP_CONTENT_TYPES_H
 

diff --git a/main/php_globals.h b/main/php_globals.h
index b367c2fcd5ea8c903af9ce427f4b67fd94f69e27..122fea904b930f95be1976070dcbe05a471a7965 100644 (file)
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -16,6 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
 
 #ifndef PHP_GLOBALS_H
 #define PHP_GLOBALS_H

diff --git a/main/php_ini.h b/main/php_ini.h
index 525e2d4e940c6030f2054ff2ff8d54458148cf09..352b37ef7febb3e29bf611c3beb4148c186a23b2 100644 (file)
--- a/main/php_ini.h
+++ b/main/php_ini.h
@@ -16,6 +16,8 @@
    +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
+
 #ifndef PHP_INI_H
 #define PHP_INI_H
 

diff --git a/main/php_logos.c b/main/php_logos.c
index a7f7f22b5447d0713ef1ce2005e6b14aca4ec6f5..56c32ede0052f391340c600d6c5fed8c683a233c 100644 (file)
--- a/main/php_logos.c
+++ b/main/php_logos.c
@@ -16,6 +16,8 @@
    +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
+
 #include "php.h"
 #include "logos.h"
 #include "php_logos.h"

diff --git a/main/php_logos.h b/main/php_logos.h
index e6e2028baee072373f505e0d1947a40679466682..31e3b234c83bfb0602867e6fe5dcb8fe3108cb4f 100644 (file)
--- a/main/php_logos.h
+++ b/main/php_logos.h
@@ -1,3 +1,24 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+
 #ifndef _PHP_LOGOS_H
 #define _PHP_LOGOS_H
 

diff --git a/main/php_main.h b/main/php_main.h
index 6afb349202ce8bdc947c2034d4a0b4e0af78d0fb..9c5e6c0d036080165af3aa33c6356a3a8008f718 100644 (file)
--- a/main/php_main.h
+++ b/main/php_main.h
@@ -17,10 +17,8 @@
    +----------------------------------------------------------------------+
  */
 
-
 /* $Id$ */
 
-
 #ifndef PHP_MAIN_H
 #define PHP_MAIN_H
 

diff --git a/main/php_memory_streams.h b/main/php_memory_streams.h
index 0fee6844ec60e1c3542f500b29f17bdd75a95d05..5d8c452ad0320a52855b382dee491436c4c2a3d3 100644 (file)
--- a/main/php_memory_streams.h
+++ b/main/php_memory_streams.h
@@ -16,6 +16,8 @@
    +----------------------------------------------------------------------+
  */
 
+/* $Id$ */
+
 #ifndef PHP_MEMORY_STREAM_H
 #define PHP_MEMORY_STREAM_H
 

diff --git a/main/php_network.h b/main/php_network.h
index 38e5ba400b1acd0898f7786944f2cf092bff1b27..fc322d93e6b038eb9356b60fc0f54f3a6ae78a04 100644 (file)
--- a/main/php_network.h
+++ b/main/php_network.h
@@ -15,6 +15,7 @@
    | Author: Stig Venaas <venaas@uninett.no>                              |
    +----------------------------------------------------------------------+
  */
+
 /* $Id$ */
 
 #ifndef _PHP_NETWORK_H

diff --git a/main/php_open_temporary_file.h b/main/php_open_temporary_file.h
index 84e19f4c8d2ec23994f8efaf8824ad09d08c24f4..0342f92ca764b64754ea96d6c28a92dd66166cf4 100644 (file)
--- a/main/php_open_temporary_file.h
+++ b/main/php_open_temporary_file.h
@@ -16,6 +16,8 @@
    +----------------------------------------------------------------------+
 */
 
+/* $Id$ */
+
 #ifndef PHP_OPEN_TEMPORARY_FILE_H
 #define PHP_OPEN_TEMPORARY_FILE_H
 

diff --git a/main/php_reentrancy.h b/main/php_reentrancy.h
index 5fbddeed7eba40c51f33c453080494b038ebe3a7..d888c59622b8dfcbc227ed9f1af21475117d6fbc 100644 (file)
--- a/main/php_reentrancy.h
+++ b/main/php_reentrancy.h
@@ -16,6 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
+/* $Id$ */
 
 #ifndef PHP_REENTRANCY_H
 #define PHP_REENTRANCY_H

diff --git a/main/php_regex.h b/main/php_regex.h
index c1d1e0c232ac2f44c543d9c675d15e5f8d49b780..b573745797f63127c3bfacad423c3b7bf90550ab 100644 (file)
--- a/main/php_regex.h
+++ b/main/php_regex.h
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 #ifndef PHP_REGEX_H
 #define PHP_REGEX_H
 

diff --git a/main/php_syslog.h b/main/php_syslog.h
index 92b09800fb038e797087fb2f2995ea6b0a99ab48..e3adf00f31ff30aee7a180445a6ab53f1c0d2ee8 100644 (file)
--- a/main/php_syslog.h
+++ b/main/php_syslog.h
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 #ifndef PHP_SYSLOG_H
 #define PHP_SYSLOG_H
 

diff --git a/main/php_variables.c b/main/php_variables.c
index f70f40c5e6b3190883754ccc9dcea98be91ffea7..233e6368db471bd6e6e73e263f67ffdc55b8cfa2 100644 (file)
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -16,6 +16,7 @@
    |          Zeev Suraski <zeev@zend.com>                                |
    +----------------------------------------------------------------------+
  */
+
 /* $Id$ */
 
 #include <stdio.h>

diff --git a/main/reentrancy.c b/main/reentrancy.c
index e5354891e41da77433882a536881e1c7801d7770..c20b3a2bdf965c156b4b13c35600a13a181ac714 100644 (file)
--- a/main/reentrancy.c
+++ b/main/reentrancy.c
@@ -16,6 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
+/* $Id$ */
 
 #include <sys/types.h>
 #include <string.h>

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 16b71dcdd1ed4c02a40e86be0fc95f80efd65bb5..3c9b6d56e222697f3a4fea80aeaa2db6c60d0abb 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -16,6 +16,7 @@
    |          Jani Taskinen <sniper@php.net>                              |
    +----------------------------------------------------------------------+
  */
+
 /* $Id$ */
 
 /*

diff --git a/main/rfc1867.h b/main/rfc1867.h
index 40b8fd580ef666a7e7598fd6fcb4a2b55c364015..d1c8c7749f9b2d7ce415fed436cb0a32622a175a 100644 (file)
--- a/main/rfc1867.h
+++ b/main/rfc1867.h
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 #ifndef RFC1867_H
 #define RFC1867_H
 

diff --git a/main/safe_mode.c b/main/safe_mode.c
index ed09c9f83ee2f5f1910d69efccf361453decabc8..4c21cb49d754a6c098bd0e350d61808e9708d391 100644 (file)
--- a/main/safe_mode.c
+++ b/main/safe_mode.c
@@ -15,6 +15,7 @@
    | Author: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                        |
    +----------------------------------------------------------------------+
  */
+
 /* $Id$ */
 
 #include "php.h"

diff --git a/main/safe_mode.h b/main/safe_mode.h
index d6330accd57ac5c7dfe726e515aeec2c5069e727..4e4d01848bc775d93b46d9359e77f43684a25ace 100644 (file)
--- a/main/safe_mode.h
+++ b/main/safe_mode.h
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 #ifndef SAFE_MODE_H
 #define SAFE_MODE_H
 

diff --git a/main/snprintf.c b/main/snprintf.c
index ec8c0d515f84cd882bd247526cea5507e5e4152e..0f72490f0bf78acdb0b27342a70d94c0c3ea21ac 100644 (file)
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 /* ====================================================================
  * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
  *

diff --git a/main/snprintf.h b/main/snprintf.h
index dc532290690b562d4e50cd979fb305f1903288b3..0a72f50e268363506b9a273fc35342a79bf03b85 100644 (file)
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@ -14,7 +14,9 @@
    +----------------------------------------------------------------------+
    | Author: Stig Sæther Bakken <ssb@fast.no>                             |
    +----------------------------------------------------------------------+
- */
+*/
+
+/* $Id$ */
 
 /*
 

diff --git a/main/spprintf.c b/main/spprintf.c
index 8f905d5ebe8da4ea4d781329f4f2437e159cbdf4..124865909fe9e395ccd1750975f6c753463afc03 100644 (file)
--- a/main/spprintf.c
+++ b/main/spprintf.c
@@ -14,7 +14,9 @@
    +----------------------------------------------------------------------+
    | Author: Marcus Boerger <helly@php.net>                               |
    +----------------------------------------------------------------------+
- */
+*/
+
+/* $Id$ */
 
 /* This is the spprintf implementation.
  * It has emerged from apache snprintf. See original header:

diff --git a/main/spprintf.h b/main/spprintf.h
index 23ecfddb54409ea293032bcbdc915174d98b19b0..5db2c8c9ecad325361c797b146001dde0dad10f2 100644 (file)
--- a/main/spprintf.h
+++ b/main/spprintf.h
@@ -16,6 +16,8 @@
    +----------------------------------------------------------------------+
  */
 
+/* $Id$ */
+
 /* 
 
 The pbuf parameter of all spprintf version receives a pointer to the allocated

diff --git a/main/streams/cast.c b/main/streams/cast.c
index 95606667b20fd8e477ce2c0db377666661948345..66acd141a3409a214cf14aaf40bce0167379aaea 100644 (file)
--- a/main/streams/cast.c
+++ b/main/streams/cast.c
@@ -12,8 +12,7 @@
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Authors:                                                             |
-   | Wez Furlong (wez@thebrainroom.com)                                   |
+   | Authors: Wez Furlong <wez@thebrainroom.com>                          |
    +----------------------------------------------------------------------+
  */
 

diff --git a/main/streams/filter.c b/main/streams/filter.c
index 3d47f1bc70eaf65399c205a65222374ee6498e27..678df03a467a3d27076bdf8a04b8d31ff9effd3a 100644 (file)
--- a/main/streams/filter.c
+++ b/main/streams/filter.c
@@ -12,8 +12,7 @@
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Authors:                                                             |
-   | Wez Furlong (wez@thebrainroom.com)                                   |
+   | Authors: Wez Furlong <wez@thebrainroom.com>                          |
    +----------------------------------------------------------------------+
  */
 

diff --git a/main/streams/memory.c b/main/streams/memory.c
index 02f64b9fa298cfdfc8ecc0e7b7d3fbceaa46fa75..d953d342f0855fc112d6d1e973126f5c59be9fb8 100644 (file)
--- a/main/streams/memory.c
+++ b/main/streams/memory.c
@@ -12,11 +12,12 @@
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Author:                                                              |
-   | Marcus Boerger <helly@php.net>                                       |
+   | Author: Marcus Boerger <helly@php.net>                               |
    +----------------------------------------------------------------------+
  */
 
+/* $Id$ */
+
 #define _GNU_SOURCE
 #include "php.h"
 

diff --git a/main/streams/php_stream_context.h b/main/streams/php_stream_context.h
index 16132dba4ebac46257c9974bf233dacaab002964..2094b4c8a3507cb1bb32220c51a753f85d139730 100644 (file)
--- a/main/streams/php_stream_context.h
+++ b/main/streams/php_stream_context.h
@@ -12,7 +12,7 @@
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Author: Wez Furlong (wez@thebrainroom.com)                           |
+   | Author: Wez Furlong <wez@thebrainroom.com>                           |
    +----------------------------------------------------------------------+
  */
 

diff --git a/main/streams/php_stream_filter_api.h b/main/streams/php_stream_filter_api.h
index ad2d9aa5b38144a300558804e8372d6d95005c8b..c23f7f70c7cc0613f34527af186f15a215c3f52a 100644 (file)
--- a/main/streams/php_stream_filter_api.h
+++ b/main/streams/php_stream_filter_api.h
@@ -12,7 +12,7 @@
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Author: Wez Furlong (wez@thebrainroom.com)                           |
+   | Author: Wez Furlong <wez@thebrainroom.com>                           |
    | With suggestions from:                                               |
    |      Moriyoshi Koizumi <moriyoshi@at.wakwak.com>                     |
    |      Sara Golemon      <pollita@php.net>                             |

diff --git a/main/streams/php_stream_plain_wrapper.h b/main/streams/php_stream_plain_wrapper.h
index fe25a50bd19b17cc139040389e2e145635a9d391..656849443359e7af1d7b8f23db2f0e17418c07c9 100644 (file)
--- a/main/streams/php_stream_plain_wrapper.h
+++ b/main/streams/php_stream_plain_wrapper.h
@@ -12,7 +12,7 @@
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Author: Wez Furlong (wez@thebrainroom.com)                           |
+   | Author: Wez Furlong <wez@thebrainroom.com>                           |
    +----------------------------------------------------------------------+
  */
 

diff --git a/main/streams/php_stream_userspace.h b/main/streams/php_stream_userspace.h
index a57a418102bc2c3800ff4db54940b32f9720fb0f..349cdd7fa517aa48c2d320559c11732f40f7d3ea 100644 (file)
--- a/main/streams/php_stream_userspace.h
+++ b/main/streams/php_stream_userspace.h
@@ -12,7 +12,7 @@
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Author: Wez Furlong (wez@thebrainroom.com)                           |
+   | Author: Wez Furlong <wez@thebrainroom.com>                           |
    +----------------------------------------------------------------------+
  */
 

diff --git a/main/streams/php_streams_int.h b/main/streams/php_streams_int.h
index 667ed2a203bf4ba447a0703c9e0fcd99a4e24db7..05ad1a0dc81856c45c197b70f670fcd768e70a80 100644 (file)
--- a/main/streams/php_streams_int.h
+++ b/main/streams/php_streams_int.h
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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: Wez Furlong <wez@thebrainroom.com>                           |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 #if ZEND_DEBUG
 #define emalloc_rel_orig(size) \
                ( __php_stream_call_depth == 0 \

diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index b1e7a489bbd8e226aec481644a1b7522b06d4e52..d45e6a1098c4ce7f714f8673c5b7736c95b90462 100644 (file)
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -12,8 +12,7 @@
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Authors:                                                             |
-   | Wez Furlong (wez@thebrainroom.com)                                   |
+   | Authors: Wez Furlong <wez@thebrainroom.com>                          |
    +----------------------------------------------------------------------+
  */
 

diff --git a/main/streams/streams.c b/main/streams/streams.c
index d2ef95dda8e0a0e4f6daa78585c0e42a0ca316d0..ae33818b79f1a3a061ea80c1474aac348969e1ce 100755 (executable)
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -12,11 +12,10 @@
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Authors:                                                             |
-   | Wez Furlong (wez@thebrainroom.com)                                   |
+   | Authors: Wez Furlong <wez@thebrainroom.com>                          |
    | Borrowed code from:                                                  |
-   | Rasmus Lerdorf <rasmus@lerdorf.on.ca>                                |
-   | Jim Winstead <jimw@php.net>                                          |
+   |          Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
+   |          Jim Winstead <jimw@php.net>                                 |
    +----------------------------------------------------------------------+
  */
 

diff --git a/main/streams/userspace.c b/main/streams/userspace.c
index 849d6dd561c2c970e5def57c134f6a659bda6f5b..096eaac8419aa4a3aaa7539ca3bf628929186ac9 100644 (file)
--- a/main/streams/userspace.c
+++ b/main/streams/userspace.c
@@ -12,8 +12,7 @@
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Authors:                                                             |
-   | Wez Furlong (wez@thebrainroom.com)                                   |
+   | Authors: Wez Furlong <wez@thebrainroom.com>                          |
    +----------------------------------------------------------------------+
 */
 

diff --git a/main/strlcat.c b/main/strlcat.c
index bf1a03eac3e253bf1912e4b510bf788c730bdeb9..f3e8f70e3e0d3f0ee2c4e4671430057dfa2a2dea 100644 (file)
--- a/main/strlcat.c
+++ b/main/strlcat.c
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 #include "php.h"
 
 #ifndef HAVE_STRLCAT

diff --git a/main/strlcpy.c b/main/strlcpy.c
index 2814a739962f11348cca26c38f8d68a8c08fc827..89ff7ba505a96a1bde8dc657b4330b315a9b88fc 100644 (file)
--- a/main/strlcpy.c
+++ b/main/strlcpy.c
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 #include "php.h"
 
 #ifndef HAVE_STRLCPY

diff --git a/main/win95nt.h b/main/win95nt.h
index 4048f91f2988b21accdce811431fd963539045b4..b6a0f9bd9fd18948ff0cf45e264a104b58fcf72a 100644 (file)
--- a/main/win95nt.h
+++ b/main/win95nt.h
@@ -1,3 +1,23 @@
+/*
+  +----------------------------------------------------------------------+
+  | PHP Version 4                                                        |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 1997-2003 The PHP Group                                |
+  +----------------------------------------------------------------------+
+  | 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.                                 |
+  | 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:                                                              |
+  +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
 /* Defines and types for Windows 95/NT */
 #define HAVE_DECLARED_TIMEZONE
 #define WIN32_LEAN_AND_MEAN