cvs: php4 /ext/standard basic_functions.c file.h /main php_streams.h streams.c user_streams.c

wez Tue Mar 19 09:35:55 2002 EDT Modified files: /php4/ext/standard basic_functions.c file.h /php4/main php_streams.h streams.c user_streams.c Log: register some constants for user streams Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.460 php4/ext/standard/basic_functions.c:1.461 --- php4/ext/standard/basic_functions.c:1.460 Tue Mar 19 08:33:04 2002 +++ php4/ext/standard/basic_functions.c Tue Mar 19 09:35:54 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.460 2002/03/19 13:33:04 wez Exp $ */ +/* $Id: basic_functions.c,v 1.461 2002/03/19 14:35:54 wez Exp $ */ #include "php.h" #include "php_streams.h" @@ -1004,6 +1004,8 @@ if (PG(allow_url_fopen)) { + PHP_MINIT(user_streams) (INIT_FUNC_ARGS_PASSTHRU); + if (FAILURE == php_register_url_stream_wrapper("http", &php_stream_http_wrapper TSRMLS_CC)) return FAILURE; if (FAILURE == php_register_url_stream_wrapper("php", &php_stream_php_wrapper TSRMLS_CC)) Index: php4/ext/standard/file.h diff -u php4/ext/standard/file.h:1.53 php4/ext/standard/file.h:1.54 --- php4/ext/standard/file.h:1.53 Tue Mar 19 08:33:07 2002 +++ php4/ext/standard/file.h Tue Mar 19 09:35:54 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.h,v 1.53 2002/03/19 13:33:07 wez Exp $ */ +/* $Id: file.h,v 1.54 2002/03/19 14:35:54 wez Exp $ */ /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */ @@ -72,6 +72,7 @@ PHP_FUNCTION(file_get_wrapper_data); PHP_FUNCTION(file_register_wrapper); +PHP_MINIT_FUNCTION(user_streams); PHPAPI int php_set_sock_blocking(int socketd, int block); PHPAPI int php_file_le_stream(void); Index: php4/main/php_streams.h diff -u php4/main/php_streams.h:1.19 php4/main/php_streams.h:1.20 --- php4/main/php_streams.h:1.19 Mon Mar 18 22:51:01 2002 +++ php4/main/php_streams.h Tue Mar 19 09:35:55 2002 @@ -254,7 +254,6 @@ # define IGNORE_URL_WIN 0 #endif -int php_init_user_streams(TSRMLS_D); int php_init_stream_wrappers(TSRMLS_D); int php_shutdown_stream_wrappers(TSRMLS_D); PHPAPI int php_register_url_stream_wrapper(char *protocol, php_stream_wrapper *wrapper TSRMLS_DC); Index: php4/main/streams.c diff -u php4/main/streams.c:1.34 php4/main/streams.c:1.35 --- php4/main/streams.c:1.34 Tue Mar 19 08:42:25 2002 +++ php4/main/streams.c Tue Mar 19 09:35:55 2002 @@ -891,9 +891,7 @@ int php_init_stream_wrappers(TSRMLS_D) { if (PG(allow_url_fopen)) { - if (zend_hash_init(&url_stream_wrappers_hash, 0, NULL, NULL, 1) == SUCCESS) - return php_init_user_streams(TSRMLS_C); - return FAILURE; + return zend_hash_init(&url_stream_wrappers_hash, 0, NULL, NULL, 1); } return SUCCESS; } Index: php4/main/user_streams.c diff -u php4/main/user_streams.c:1.4 php4/main/user_streams.c:1.5 --- php4/main/user_streams.c:1.4 Tue Mar 19 08:46:32 2002 +++ php4/main/user_streams.c Tue Mar 19 09:35:55 2002 @@ -41,10 +41,20 @@ efree(uwrap); } -int php_init_user_streams(TSRMLS_D) + +PHP_MINIT_FUNCTION(user_streams) { le_protocols = zend_register_list_destructors_ex(stream_wrapper_dtor, NULL, "stream factory", 0); - return le_protocols == FAILURE ? FAILURE : SUCCESS; + if (le_protocols == FAILURE) + return FAILURE; + + REGISTER_LONG_CONSTANT("STREAM_USE_PATH", USE_PATH, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("STREAM_IGNORE_URL", IGNORE_URL, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("STREAM_ENFORCE_SAFE_MODE", ENFORCE_SAFE_MODE, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("STREAM_REPORT_ERRORS", REPORT_ERRORS, CONST_CS|CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("STREAM_MUST_SEEK", STREAM_MUST_SEEK, CONST_CS|CONST_PERSISTENT); + + return SUCCESS; } struct _php_userstream_data {