cvs: php4 /ext/standard user_filters.c /main php_streams.h streams.c

pollita Sun Jan 5 23:06:40 2003 EDT Modified files: /php4/main streams.c php_streams.h /php4/ext/standard user_filters.c Log: Expose stream_filters_hash so that it can be searched by stream_get_filters() Index: php4/main/streams.c diff -u php4/main/streams.c:1.140 php4/main/streams.c:1.141 --- php4/main/streams.c:1.140 Wed Jan 1 04:58:17 2003 +++ php4/main/streams.c Sun Jan 5 23:06:40 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.140 2003/01/01 09:58:17 wez Exp $ */ +/* $Id: streams.c,v 1.141 2003/01/06 04:06:40 pollita Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -386,6 +386,11 @@ /* {{{ filter API */ static HashTable stream_filters_hash; + +PHPAPI HashTable *php_get_stream_filters_hash() +{ + return &stream_filters_hash; +} PHPAPI int php_stream_filter_register_factory(const char *filterpattern, php_stream_filter_factory *factory TSRMLS_DC) { Index: php4/main/php_streams.h diff -u php4/main/php_streams.h:1.64 php4/main/php_streams.h:1.65 --- php4/main/php_streams.h:1.64 Thu Jan 2 08:31:10 2003 +++ php4/main/php_streams.h Sun Jan 5 23:06:40 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_streams.h,v 1.64 2003/01/02 13:31:10 derick Exp $ */ +/* $Id: php_streams.h,v 1.65 2003/01/06 04:06:40 pollita Exp $ */ #ifndef PHP_STREAMS_H #define PHP_STREAMS_H @@ -603,9 +603,9 @@ (xmsg), (xcode), 0, 0, NULL TSRMLS_CC); } } while(0) -/* Give other modules access to the url_stream_wrappers_hash */ +/* Give other modules access to the url_stream_wrappers_hash and stream_filters_hash */ PHPAPI HashTable *php_stream_get_url_stream_wrappers_hash(); - +PHPAPI HashTable *php_get_stream_filters_hash(); #endif /* Index: php4/ext/standard/user_filters.c diff -u php4/ext/standard/user_filters.c:1.5 php4/ext/standard/user_filters.c:1.6 --- php4/ext/standard/user_filters.c:1.5 Sun Jan 5 17:24:49 2003 +++ php4/ext/standard/user_filters.c Sun Jan 5 23:06:40 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: user_filters.c,v 1.5 2003/01/05 22:24:49 pollita Exp $ */ +/* $Id: user_filters.c,v 1.6 2003/01/06 04:06:40 pollita Exp $ */ #include "php.h" #include "php_globals.h" @@ -417,6 +417,7 @@ { char *filter_name; int key_flags, filter_name_len = 0; + HashTable *filters_hash; if (ZEND_NUM_ARGS() != 0) { WRONG_PARAM_COUNT; @@ -424,10 +425,12 @@ array_init(return_value); - if (BG(user_filter_map)) { - for(zend_hash_internal_pointer_reset(BG(user_filter_map)); - (key_flags = zend_hash_get_current_key_ex(BG(user_filter_map), &filter_name, &filter_name_len, NULL, 0, NULL)) != HASH_KEY_NON_EXISTANT; - zend_hash_move_forward(BG(user_filter_map))) + filters_hash = php_get_stream_filters_hash(); + + if (filters_hash) { + for(zend_hash_internal_pointer_reset(filters_hash); + (key_flags = zend_hash_get_current_key_ex(filters_hash, &filter_name, &filter_name_len, NULL, 0, NULL)) != HASH_KEY_NON_EXISTANT; + zend_hash_move_forward(filters_hash)) if (key_flags == HASH_KEY_IS_STRING) add_next_index_stringl(return_value, filter_name, filter_name_len, 1); }