cvs: php4 /sapi/apache mod_php4.c mod_php4.h php_apache.c

sas Thu Dec 7 05:07:18 2000 EDT Modified files: /php4/sapi/apache mod_php4.c mod_php4.h php_apache.c Log: Axe rest of DAV leftovers and use STD_PHP_INI_ENTRY in the INI section Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.77 php4/sapi/apache/mod_php4.c:1.78 --- php4/sapi/apache/mod_php4.c:1.77 Fri Nov 17 18:44:02 2000 +++ php4/sapi/apache/mod_php4.c Thu Dec 7 05:07:18 2000 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.77 2000/11/18 02:44:02 zeev Exp $ */ +/* $Id: mod_php4.c,v 1.78 2000/12/07 13:07:18 sas Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -59,9 +59,6 @@ #include "util_script.h" #include "mod_php4.h" -#if HAVE_MOD_DAV -# include "mod_dav.h" -#endif #undef shutdown @@ -724,46 +721,6 @@ } -#if HAVE_MOD_DAV - -extern int phpdav_mkcol_test_handler(request_rec *r); -extern int phpdav_mkcol_create_handler(request_rec *r); - -/* conf is being read twice (both here and in send_php()) */ -int send_parsed_php_dav_script(request_rec *r) -{ - php_apache_info_struct *conf; - - conf = (php_apache_info_struct *) get_module_config(r->per_dir_config, - &php4_module); - return send_php(r, 0, 0, conf->dav_script); -} - -static int php_type_checker(request_rec *r) -{ - php_apache_info_struct *conf; - - conf = (php_apache_info_struct *)get_module_config(r->per_dir_config, - &php4_module); - - /* If DAV support is enabled, use mod_dav's type checker. */ - if (conf->dav_script) { - dav_api_set_request_handler(r, send_parsed_php_dav_script); - dav_api_set_mkcol_handlers(r, phpdav_mkcol_test_handler, - phpdav_mkcol_create_handler); - /* leave the rest of the request to mod_dav */ - return dav_api_type_checker(r); - } - - return DECLINED; -} - -#else /* HAVE_MOD_DAV */ - -# define php_type_checker NULL - -#endif /* HAVE_MOD_DAV */ - handler_rec php_handlers[] = { @@ -799,7 +756,7 @@ NULL, /* check_user_id */ NULL, /* check auth */ NULL, /* check access */ - php_type_checker, /* type_checker */ + NULL, /* type_checker */ NULL, /* fixups */ NULL /* logger */ #if MODULE_MAGIC_NUMBER >= 19970103 Index: php4/sapi/apache/mod_php4.h diff -u php4/sapi/apache/mod_php4.h:1.7 php4/sapi/apache/mod_php4.h:1.8 --- php4/sapi/apache/mod_php4.h:1.7 Sun Jul 2 16:46:50 2000 +++ php4/sapi/apache/mod_php4.h Thu Dec 7 05:07:18 2000 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.h,v 1.7 2000/07/02 23:46:50 sas Exp $ */ +/* $Id: mod_php4.h,v 1.8 2000/12/07 13:07:18 sas Exp $ */ #ifndef MOD_PHP4_H #define MOD_PHP4_H @@ -29,7 +29,6 @@ typedef struct { long engine; long last_modified; - char *dav_script; long xbithack; } php_apache_info_struct; Index: php4/sapi/apache/php_apache.c diff -u php4/sapi/apache/php_apache.c:1.20 php4/sapi/apache/php_apache.c:1.21 --- php4/sapi/apache/php_apache.c:1.20 Fri Oct 13 12:08:05 2000 +++ php4/sapi/apache/php_apache.c Thu Dec 7 05:07:18 2000 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.20 2000/10/13 19:08:05 dbeu Exp $ */ +/* $Id: php_apache.c,v 1.21 2000/12/07 13:07:18 sas Exp $ */ #define NO_REGEX_EXTRA_H @@ -73,42 +73,10 @@ }; -static PHP_INI_MH(OnChangeApacheInt) -{ - long *p; - char *base = (char *) &php_apache_info; - - p = (long *) (base+(size_t) mh_arg1); - - if (new_value) { - *p = atoi(new_value); - return SUCCESS; - } else { - return FAILURE; - } -} - - -static PHP_INI_MH(OnChangeApacheString) -{ - char **p; - char *base = (char *) &php_apache_info; - - p = (char **) (base+(size_t) mh_arg1); - - if (new_value) { - *p = new_value; - return SUCCESS; - } else { - return FAILURE; - } -} - PHP_INI_BEGIN() - PHP_INI_ENTRY1("xbithack", "0", PHP_INI_ALL, OnChangeApacheInt, (void *) XtOffsetOf(php_apache_info_struct, xbithack)) - PHP_INI_ENTRY1("engine", "1", PHP_INI_ALL, OnChangeApacheInt, (void *) XtOffsetOf(php_apache_info_struct, engine)) - PHP_INI_ENTRY1("last_modified", "0", PHP_INI_ALL, OnChangeApacheInt, (void *) XtOffsetOf(php_apache_info_struct, last_modified)) - PHP_INI_ENTRY1("dav_script", NULL, PHP_INI_ALL, OnChangeApacheString, (void *) XtOffsetOf(php_apache_info_struct, dav_script)) + STD_PHP_INI_ENTRY("xbithack", "0", PHP_INI_ALL, OnUpdateInt, xbithack, php_apache_info_struct, php_apache_info) + STD_PHP_INI_ENTRY("engine", "1", PHP_INI_ALL, OnUpdateInt, engine, php_apache_info_struct, php_apache_info) + STD_PHP_INI_ENTRY("last_modified", "0", PHP_INI_ALL, OnUpdateInt, last_modified, php_apache_info_struct, php_apache_info) PHP_INI_END()