From dc4b1c1adf96b1b5586908df8c5d9a33b8e52c9b Mon Sep 17 00:00:00 2001 From: Andrei Zmievski Date: Tue, 5 Dec 2000 22:58:36 +0000 Subject: [PATCH] @- Removed ext/dav due to obsolescence. (Andrei) --- ext/dav/CREDITS | 2 - ext/dav/Makefile.in | 5 - ext/dav/config.m4 | 29 ----- ext/dav/dav.c | 264 -------------------------------------------- ext/dav/php_dav.h | 55 --------- ext/dav/setup.stub | 2 - 6 files changed, 357 deletions(-) delete mode 100644 ext/dav/CREDITS delete mode 100644 ext/dav/Makefile.in delete mode 100644 ext/dav/config.m4 delete mode 100644 ext/dav/dav.c delete mode 100644 ext/dav/php_dav.h delete mode 100644 ext/dav/setup.stub diff --git a/ext/dav/CREDITS b/ext/dav/CREDITS deleted file mode 100644 index dbc9ffa981..0000000000 --- a/ext/dav/CREDITS +++ /dev/null @@ -1,2 +0,0 @@ -DAV -Stig Bakken diff --git a/ext/dav/Makefile.in b/ext/dav/Makefile.in deleted file mode 100644 index 166edc8ff2..0000000000 --- a/ext/dav/Makefile.in +++ /dev/null @@ -1,5 +0,0 @@ - -LTLIBRARY_NAME = libdav.la -LTLIBRARY_SOURCES = dav.c - -include $(top_srcdir)/build/dynlib.mk diff --git a/ext/dav/config.m4 b/ext/dav/config.m4 deleted file mode 100644 index 3847c5cb26..0000000000 --- a/ext/dav/config.m4 +++ /dev/null @@ -1,29 +0,0 @@ -dnl $Id$ -dnl config.m4 for extension dav -dnl don't forget to call PHP_EXTENSION(dav) - -AC_MSG_CHECKING(whether to enable DAV support through mod_dav) -AC_ARG_WITH(mod-dav, -[ --with-mod-dav=DIR Include DAV support through Apache's mod_dav, - DIR is mod_dav's installation directory (Apache - module version only!)], -[ - if test "$withval" = "yes"; then - AC_MSG_ERROR(Must give parameter to --with-mod-dav!) - else - if test "$withval" != "no"; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_MOD_DAV, 1, [Whether you have mod_dav]) - CFLAGS="$CFLAGS -DHAVE_MOD_DAV -I$withval" - INCLUDES="$INCLUDES -I$withval" - PHP_EXTENSION(dav) - else - AC_MSG_RESULT(no) - AC_DEFINE(HAVE_MOD_DAV, 0, [Whether you have mod_dav]) - fi - fi -],[ - AC_MSG_RESULT(no) - AC_DEFINE(HAVE_MOD_DAV, 0, [Whether you have mod_dav]) -]) - diff --git a/ext/dav/dav.c b/ext/dav/dav.c deleted file mode 100644 index 4a4f28b46e..0000000000 --- a/ext/dav/dav.c +++ /dev/null @@ -1,264 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP version 4.0 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997, 1998, 1999, 2000 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. | - +----------------------------------------------------------------------+ - | Authors: Stig Sæther Bakken | - +----------------------------------------------------------------------+ - */ - -/* $Id$ */ - -#define IS_EXT_MODULE -#include "php.h" -#include "php_dav.h" - -#if defined(THREAD_SAFE) && !PHP_31 -# undef THREAD_SAFE -#endif - -#if HAVE_MOD_DAV - -# include "mod_dav.h" -#include "ext/standard/info.h" - -/* {{{ thread safety stuff */ - -# ifdef THREAD_SAFE -# define DAV_GLOBAL(a) phpdav_globals->a -# define DAV_TLS_VARS phpdav_global_struct *phpdav_globals = TlsGetValue(PHPDAVTls); - -void *phpdav_mutex; -DWORD PHPDAVTls; -static int numthreads=0; - -typedef struct phpdav_global_struct { - phpdav_module php_dav_module; -} phpdav_global_struct; - -# else /* !defined(THREAD_SAFE) */ -# define DAV_GLOBAL(a) a -# define DAV_TLS_VARS - -phpdav_module php_dav_module; - -# endif /* defined(THREAD_SAFE) */ - -# define DAV_HANDLER(a) DAV_GLOBAL(php_dav_module).a##_handler -# define DAV_SET_HANDLER(a,b) \ - dav_set_handler(&DAV_GLOBAL(php_dav_module).a##_handler,(b)) - - -/* }}} */ -/* {{{ dynamically loadable module stuff */ - -#ifdef COMPILE_DL_DAV -ZEND_GET_MODULE(phpdav) -# endif /* COMPILE_DL */ - -/* }}} */ -/* {{{ function prototypes */ - -PHP_MINIT_FUNCTION(phpdav); -PHP_MSHUTDOWN_FUNCTION(phpdav); -PHP_RSHUTDOWN_FUNCTION(phpdav); -PHP_MINFO_FUNCTION(phpdav); - -/* }}} */ -/* {{{ extension definition structures */ - -function_entry phpdav_functions[] = { - PHP_FE(dav_set_mkcol_handlers, NULL) - {NULL, NULL, NULL} -}; - -zend_module_entry phpdav_module_entry = { - "dav", /* extension name */ - phpdav_functions, /* extension function list */ - PHP_MINIT(phpdav), /* extension-wide startup function */ - PHP_MSHUTDOWN(phpdav), /* extension-wide shutdown function */ - NULL, /* per-request startup function */ - PHP_RSHUTDOWN(phpdav), /* per-request shutdown function */ - PHP_MINFO(phpdav), /* information function */ - STANDARD_MODULE_PROPERTIES -}; - -/* }}} */ -/* {{{ startup, shutdown and info functions */ - -PHP_MINIT_FUNCTION(phpdav) -{ -#if defined(THREAD_SAFE) - phpdav_global_struct *phpdav_globals; - PHP_MUTEX_ALLOC(phpdav_mutex); - PHP_MUTEX_LOCK(phpdav_mutex); - numthreads++; - if (numthreads==1){ - if (!PHP3_TLS_PROC_STARTUP(PHPDAVTls)){ - PHP_MUTEX_UNLOCK(phpdav_mutex); - PHP_MUTEX_FREE(phpdav_mutex); - return FAILURE; - } - } - PHP_MUTEX_UNLOCK(phdpav_mutex); - if(!PHP3_TLS_THREAD_INIT(PHPDAVTls,phpdav_globals,phpdav_global_struct)){ - PHP_MUTEX_FREE(phpdav_mutex); - return FAILURE; - } -#endif - return SUCCESS; -} - - -PHP_MSHUTDOWN_FUNCTION(phpdav) -{ - DAV_TLS_VARS; -#ifdef THREAD_SAFE - PHP3_TLS_THREAD_FREE(phpdav_globals); - PHP_MUTEX_LOCK(phpdav_mutex); - numthreads--; - if (numthreads < 1) { - PHP3_TLS_PROC_SHUTDOWN(PHPDAVTls); - PHP_MUTEX_UNLOCK(phpdav_mutex); - PHP_MUTEX_FREE(phpdav_mutex); - return SUCCESS; - } - PHP_MUTEX_UNLOCK(phpdav_mutex); -#endif - return SUCCESS; -} - - -PHP_RSHUTDOWN_FUNCTION(phpdav) -{ - if (DAV_HANDLER(mkcol_test)) { - efree(DAV_HANDLER(mkcol_test)); - } - if (DAV_HANDLER(mkcol_create)) { - efree(DAV_HANDLER(mkcol_create)); - } - return SUCCESS; -} - - -PHP_MINFO_FUNCTION(phpdav); -{ - php_info_print_table_start(); - php_info_print_table_row(2, "DAV Support", "enabled"); - php_info_print_table_end(); -} - -/* {{{ extension-internal functions */ - - /* {{{ dav_set_handler() */ - -static void -dav_set_handler(char **nameBufp, pval *data) -{ - if (data->value.str.len > 0) { - if (*nameBufp != NULL) { - efree(*nameBufp); - } - *nameBufp = php3i_pval_strdup(data); - } else { - if (*nameBufp != NULL) { - efree(*nameBufp); - } - *nameBufp = NULL; - } -} - -/* }}} */ - /* {{{ dav_call_handler() */ - -static int -dav_call_handler(char *funcName, int argc, pval **argv) -{ - if (funcName) { - pval *retval, *func; - int i, ret; - HashTable *function_table; - - func = php3i_string_pval(funcName); - ALLOC_ZVAL(retval); - function_table = php3i_get_function_table(); - if (call_user_function(function_table, NULL, func, retval, argc, argv) == FAILURE) { - php3tls_pval_destructor(retval); - efree(retval); - return HTTP_INTERNAL_SERVER_ERROR; - } - php3tls_pval_destructor(func); - efree(func); - for (i = 0; i < argc; i++) { - php3tls_pval_destructor(argv[i]); - efree(argv[i]); - } - convert_to_long(retval); - ret = retval->value.lval; - efree(retval); - return ret; - } - return DECLINED; -} - -/* }}} */ - -int phpdav_mkcol_test_handler(request_rec *r) -{ - pval *arg; - - if (DAV_HANDLER(mkcol_test) == NULL) { - return DECLINED; - } - arg = php3i_string_pval(r->filename); - return dav_call_handler(DAV_HANDLER(mkcol_test), 1, &arg); -} - -int phpdav_mkcol_create_handler(request_rec *r) -{ - pval *arg; - - if (DAV_HANDLER(mkcol_create) == NULL) { - return DECLINED; - } - arg = php3i_string_pval(r->filename); - return dav_call_handler(DAV_HANDLER(mkcol_create), 1, &arg); -} - -/* }}} */ - -/************************* EXTENSION FUNCTIONS *************************/ - -/* {{{ proto void dav_set_mkcol_handlers(string test, string create) - Sets the function to test whether a DAV collection exists for MKCOL */ -PHP_FUNCTION(dav_set_mkcol_handlers) -{ - pval *test, *create; - DAV_TLS_VARS; - - if (ZEND_NUM_ARGS() != 2 || getParameters(ht, 2, &test, &create) == FAILURE) { - WRONG_PARAM_COUNT; - } - DAV_SET_HANDLER(mkcol_test, test); - DAV_SET_HANDLER(mkcol_create, create); - RETVAL_TRUE; -} -/* }}} */ - -#endif - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/dav/php_dav.h b/ext/dav/php_dav.h deleted file mode 100644 index a288122826..0000000000 --- a/ext/dav/php_dav.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP version 4.0 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997, 1998, 1999, 2000 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. | - +----------------------------------------------------------------------+ - | Authors: Stig Sæther Bakken | - +----------------------------------------------------------------------+ -*/ - -/* $Id$ */ - -#ifndef PHP_DAV_H -#define PHP_DAV_H - -#if HAVE_MOD_DAV - -typedef struct { - int foo; - char *mkcol_test_handler; - char *mkcol_create_handler; -} phpdav_module; - -extern zend_module_entry phpdav_module_entry; -#define phpdav_module_ptr &phpdav_module_entry - -int phpdav_mkcol_test_handler(request_rec *); - -PHP_FUNCTION(dav_set_mkcol_handlers); - -#else /* !HAVE_MOD_DAV */ - -#define phpdav_module_ptr NULL - -#endif /* HAVE_MOD_DAV */ - -#define phpext_dav_ptr phpdav_module_ptr - -#endif /* PHP_DAV_H */ - - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/dav/setup.stub b/ext/dav/setup.stub deleted file mode 100644 index 881144c1ca..0000000000 --- a/ext/dav/setup.stub +++ /dev/null @@ -1,2 +0,0 @@ -# $Id$ -# This extension is still very much under construction. -- 2.40.0