diff options
Diffstat (limited to 'main/streams')
-rw-r--r-- | main/streams/cast.c | 3 | ||||
-rw-r--r-- | main/streams/filter.c | 3 | ||||
-rw-r--r-- | main/streams/memory.c | 5 | ||||
-rw-r--r-- | main/streams/php_stream_context.h | 2 | ||||
-rw-r--r-- | main/streams/php_stream_filter_api.h | 2 | ||||
-rw-r--r-- | main/streams/php_stream_plain_wrapper.h | 2 | ||||
-rw-r--r-- | main/streams/php_stream_userspace.h | 2 | ||||
-rw-r--r-- | main/streams/php_streams_int.h | 20 | ||||
-rw-r--r-- | main/streams/plain_wrapper.c | 3 | ||||
-rwxr-xr-x | main/streams/streams.c | 7 | ||||
-rw-r--r-- | main/streams/userspace.c | 3 |
11 files changed, 34 insertions, 18 deletions
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> | +----------------------------------------------------------------------+ */ |