cvs: php4 / NEWS /ext/standard basic_functions.c basic_functions.h streamsfuncs.h user_filters.c /ext/standard/tests/file fopencookie.phpt
userfilters.phpt userstreams.phpt /main/streams userspace.c

derick Mon May 19 11:35:06 2003 EDT Modified files: /php4 NEWS /php4/ext/standard basic_functions.c basic_functions.h streamsfuncs.h user_filters.c /php4/ext/standard/tests/file fopencookie.phpt userfilters.phpt userstreams.phpt /php4/main/streams userspace.c Log: - Rename stream_register_filter() to stream_filter_register(), stream_register_wrapper() to stream_wrapper_register() and added an alias for the latter change. Index: php4/NEWS diff -u php4/NEWS:1.1406 php4/NEWS:1.1407 --- php4/NEWS:1.1406 Wed May 14 15:03:46 2003 +++ php4/NEWS Mon May 19 11:35:06 2003 @@ -3,6 +3,7 @@ ? ? ??? 200?, Version 5.0.0 - Moved extensions to PECL (http://pear.php.net/): (James, Tal) . ext/fribidi +- Renamed stream_register_wrapper() to stream_wrapper_register(). (Derick) - Fixed dirname() and strip_tags() to be binary-safe. (Moriyoshi) - Fixed bug #22386 (Using browscap causes segfault). (Jay) - Fixed bug #22895 (PHP cli outputs errors in text AND html). (Marcus) Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.608 php4/ext/standard/basic_functions.c:1.609 --- php4/ext/standard/basic_functions.c:1.608 Thu May 15 21:09:58 2003 +++ php4/ext/standard/basic_functions.c Mon May 19 11:35:06 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.608 2003/05/16 01:09:58 iliaa Exp $ */ +/* $Id: basic_functions.c,v 1.609 2003/05/19 15:35:06 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -699,7 +699,8 @@ PHP_FE(stream_get_meta_data, NULL) PHP_FE(stream_get_line, NULL) - PHP_FE(stream_register_wrapper, NULL) + PHP_FE(stream_wrapper_register, NULL) + PHP_FALIAS(stream_register_wrapper, stream_wrapper_register, NULL) PHP_FE(stream_get_wrappers, NULL) PHP_FE(stream_get_transports, NULL) PHP_FE(get_headers, NULL) @@ -897,7 +898,7 @@ PHP_FE(str_rot13, NULL) PHP_FE(stream_get_filters, NULL) - PHP_FE(stream_register_filter, NULL) + PHP_FE(stream_filter_register, NULL) PHP_FE(stream_bucket_make_writeable, NULL) PHP_FE(stream_bucket_prepend, NULL) PHP_FE(stream_bucket_append, NULL) Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.117 php4/ext/standard/basic_functions.h:1.118 --- php4/ext/standard/basic_functions.h:1.117 Tue Apr 1 00:30:32 2003 +++ php4/ext/standard/basic_functions.h Mon May 19 11:35:06 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.h,v 1.117 2003/04/01 05:30:32 sebastian Exp $ */ +/* $Id: basic_functions.h,v 1.118 2003/05/19 15:35:06 derick Exp $ */ #ifndef BASIC_FUNCTIONS_H #define BASIC_FUNCTIONS_H @@ -108,7 +108,7 @@ PHP_FUNCTION(str_rot13); PHP_FUNCTION(stream_get_filters); -PHP_FUNCTION(stream_register_filter); +PHP_FUNCTION(stream_filter_register); PHP_FUNCTION(stream_bucket_make_writeable); PHP_FUNCTION(stream_bucket_prepend); PHP_FUNCTION(stream_bucket_append); Index: php4/ext/standard/streamsfuncs.h diff -u php4/ext/standard/streamsfuncs.h:1.3 php4/ext/standard/streamsfuncs.h:1.4 --- php4/ext/standard/streamsfuncs.h:1.3 Fri Apr 4 00:21:03 2003 +++ php4/ext/standard/streamsfuncs.h Mon May 19 11:35:06 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.h,v 1.3 2003/04/04 05:21:03 pollita Exp $ */ +/* $Id: streamsfuncs.h,v 1.4 2003/05/19 15:35:06 derick Exp $ */ /* Flags for stream_socket_client */ #define PHP_STREAM_CLIENT_PERSISTENT 1 @@ -38,7 +38,7 @@ PHP_FUNCTION(stream_get_wrappers); PHP_FUNCTION(stream_get_line); PHP_FUNCTION(stream_get_meta_data); -PHP_FUNCTION(stream_register_wrapper); +PHP_FUNCTION(stream_wrapper_register); PHP_FUNCTION(stream_context_create); PHP_FUNCTION(stream_context_set_params); PHP_FUNCTION(stream_context_set_option); Index: php4/ext/standard/user_filters.c diff -u php4/ext/standard/user_filters.c:1.14 php4/ext/standard/user_filters.c:1.15 --- php4/ext/standard/user_filters.c:1.14 Mon Apr 21 14:43:36 2003 +++ php4/ext/standard/user_filters.c Mon May 19 11:35:06 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: user_filters.c,v 1.14 2003/04/21 18:43:36 moriyoshi Exp $ */ +/* $Id: user_filters.c,v 1.15 2003/05/19 15:35:06 derick Exp $ */ /* * TODO: Rewrite for buckets. @@ -469,9 +469,9 @@ } /* }}} */ -/* {{{ proto bool stream_register_filter(string filtername, string classname) +/* {{{ proto bool stream_filter_register(string filtername, string classname) Registers a custom filter handler class */ -PHP_FUNCTION(stream_register_filter) +PHP_FUNCTION(stream_filter_register) { char *filtername, *classname; int filtername_len, classname_len; Index: php4/ext/standard/tests/file/fopencookie.phpt diff -u php4/ext/standard/tests/file/fopencookie.phpt:1.2 php4/ext/standard/tests/file/fopencookie.phpt:1.3 --- php4/ext/standard/tests/file/fopencookie.phpt:1.2 Thu Nov 14 09:26:15 2002 +++ php4/ext/standard/tests/file/fopencookie.phpt Mon May 19 11:35:06 2003 @@ -77,7 +77,7 @@ } -stream_register_wrapper("cookietest", "userstream"); +stream_wrapper_register("cookietest", "userstream"); include("cookietest://foo"); Index: php4/ext/standard/tests/file/userfilters.phpt diff -u php4/ext/standard/tests/file/userfilters.phpt:1.4 php4/ext/standard/tests/file/userfilters.phpt:1.5 --- php4/ext/standard/tests/file/userfilters.phpt:1.4 Tue Apr 1 19:41:09 2003 +++ php4/ext/standard/tests/file/userfilters.phpt Mon May 19 11:35:06 2003 @@ -18,7 +18,7 @@ } } -stream_register_filter('testfilter','testfilter'); +stream_filter_register('testfilter','testfilter'); $text = "Hello There!"; Index: php4/ext/standard/tests/file/userstreams.phpt diff -u php4/ext/standard/tests/file/userstreams.phpt:1.9 php4/ext/standard/tests/file/userstreams.phpt:1.10 --- php4/ext/standard/tests/file/userstreams.phpt:1.9 Sun Dec 22 13:05:36 2002 +++ php4/ext/standard/tests/file/userstreams.phpt Mon May 19 11:35:06 2003 @@ -157,17 +157,17 @@ } -if (@stream_register_wrapper("bogus", "class_not_exist")) { +if (@stream_wrapper_register("bogus", "class_not_exist")) { die("Registered a non-existant class!!!???"); } echo "Not Registered\n"; -if (!stream_register_wrapper("test", "mystream")) { +if (!stream_wrapper_register("test", "mystream")) { die("test wrapper registration failed"); } echo "Registered\n"; -if (!stream_register_wrapper("bogon", "uselessstream")) { +if (!stream_wrapper_register("bogon", "uselessstream")) { die("bogon wrapper registration failed"); } echo "Registered\n"; Index: php4/main/streams/userspace.c diff -u php4/main/streams/userspace.c:1.4 php4/main/streams/userspace.c:1.5 --- php4/main/streams/userspace.c:1.4 Wed May 14 14:30:49 2003 +++ php4/main/streams/userspace.c Mon May 19 11:35:06 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: userspace.c,v 1.4 2003/05/14 18:30:49 pollita Exp $ */ +/* $Id: userspace.c,v 1.5 2003/05/19 15:35:06 derick Exp $ */ #include "php.h" #include "php_globals.h" @@ -342,9 +342,9 @@ } -/* {{{ proto bool stream_register_wrapper(string protocol, string classname) +/* {{{ proto bool stream_wrapper_register(string protocol, string classname) Registers a custom URL protocol handler class */ -PHP_FUNCTION(stream_register_wrapper) +PHP_FUNCTION(stream_wrapper_register) { char *protocol, *classname; int protocol_len, classname_len;