diff options
| author | foobar <sniper@php.net> | 2003-02-19 08:40:19 +0000 | 
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-02-19 08:40:19 +0000 | 
| commit | 8e3f23e3c00a4973acb75cbafc15fea1c7f2bc4f (patch) | |
| tree | bf22750ab9492bef7d62066d0f5033a78a712054 | |
| parent | 48e5c1dae7242d5bf54c278f4e0513bc0b748151 (diff) | |
| download | php-git-8e3f23e3c00a4973acb75cbafc15fea1c7f2bc4f.tar.gz | |
ws fixes + missing $Id$ tags, headers added
51 files changed, 369 insertions, 26 deletions
| diff --git a/ext/ereg/php_regex.h b/ext/ereg/php_regex.h index c1d1e0c232..b573745797 100644 --- 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 75c80fae41..4ecc77a8b2 100644 --- 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 65e3f7f5e9..ae28159913 100644 --- 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 c05fefc201..e7b392ee1d 100644 --- 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 d1c9f57007..831d11a9ef 100644 --- 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 42244e84a6..331360c267 100644 --- 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 4903d6c4bb..2af72800ac 100644 --- 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 e133fc42c5..6d83ae60a2 100644 --- 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 b0c3b6e51d..60b254893a 100644 --- 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 73d1a25d4e..69d8cab177 100644 --- 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 3711c0e8a3..4425dcec09 100644 --- 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 34da44cf2f..117f859e94 100644 --- 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 34b46f7a36..cf96982e6b 100644 --- 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 4093a79a90..be0758e34d 100644 --- 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 f934b07925..a9ab40550f 100644 --- 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 ea36d53df6..27f8c3fe62 100644 --- 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 b367c2fcd5..122fea904b 100644 --- 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 525e2d4e94..352b37ef7f 100644 --- 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 a7f7f22b54..56c32ede00 100644 --- 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 e6e2028bae..31e3b234c8 100644 --- 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 6afb349202..9c5e6c0d03 100644 --- 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 0fee6844ec..5d8c452ad0 100644 --- 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 38e5ba400b..fc322d93e6 100644 --- 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 84e19f4c8d..0342f92ca7 100644 --- 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 5fbddeed7e..d888c59622 100644 --- 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 c1d1e0c232..b573745797 100644 --- 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 92b09800fb..e3adf00f31 100644 --- 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 f70f40c5e6..233e6368db 100644 --- 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 e5354891e4..c20b3a2bdf 100644 --- 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 16b71dcdd1..3c9b6d56e2 100644 --- 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 40b8fd580e..d1c8c7749f 100644 --- 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 ed09c9f83e..4c21cb49d7 100644 --- 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 d6330accd5..4e4d01848b 100644 --- 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 ec8c0d515f..0f72490f0b 100644 --- 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 dc53229069..0a72f50e26 100644 --- 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 8f905d5ebe..124865909f 100644 --- 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 23ecfddb54..5db2c8c9ec 100644 --- 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 95606667b2..66acd141a3 100644 --- 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 3d47f1bc70..678df03a46 100644 --- 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 02f64b9fa2..d953d342f0 100644 --- 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 16132dba4e..2094b4c8a3 100644 --- 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 ad2d9aa5b3..c23f7f70c7 100644 --- 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 fe25a50bd1..6568494433 100644 --- 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 a57a418102..349cdd7fa5 100644 --- 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 667ed2a203..05ad1a0dc8 100644 --- 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 b1e7a489bb..d45e6a1098 100644 --- 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 d2ef95dda8..ae33818b79 100755 --- 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 849d6dd561..096eaac841 100644 --- 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 bf1a03eac3..f3e8f70e3e 100644 --- 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 2814a73996..89ff7ba505 100644 --- 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 4048f91f29..b6a0f9bd9f 100644 --- 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 | 
