CVS update: php3

Date: Friday December 4, 1998 @ 14:22 Author: ssb Update of /repository/php3 In directory asf:/u/temp/cvs-serv763 Modified Files: mod_php3.c Log Message: DAV bugfix Index: php3/mod_php3.c diff -c php3/mod_php3.c:1.86 php3/mod_php3.c:1.87 *** php3/mod_php3.c:1.86 Fri Dec 4 13:30:23 1998 --- php3/mod_php3.c Fri Dec 4 14:22:58 1998 *************** *** 27,33 **** | (with helpful hints from Dean Gaudet <dgaudet@arctic.org> | +----------------------------------------------------------------------+ */ ! /* $Id: mod_php3.c,v 1.86 1998/12/04 18:30:23 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 27,33 ---- | (with helpful hints from Dean Gaudet <dgaudet@arctic.org> | +----------------------------------------------------------------------+ */ ! /* $Id: mod_php3.c,v 1.87 1998/12/04 19:22:58 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 187,194 **** } /* Make sure file exists */ ! if (r->finfo.st_mode == 0) return NOT_FOUND; /* grab configuration settings */ conf = (php3_ini_structure *) get_module_config(r->per_dir_config, --- 187,195 ---- } /* Make sure file exists */ ! if (filename == NULL && r->finfo.st_mode == 0) { return NOT_FOUND; + } /* grab configuration settings */ conf = (php3_ini_structure *) get_module_config(r->per_dir_config, *************** *** 204,213 **** r->allowed |= (1 << METHODS) - 1; return DECLINED; } - /* Open the file */ if (filename == NULL) { filename = r->filename; } if ((fd = popenf(r->pool, filename, O_RDONLY, 0)) == -1) { log_reason("file permissions deny server access", filename, r); return FORBIDDEN; --- 205,214 ---- r->allowed |= (1 << METHODS) - 1; return DECLINED; } if (filename == NULL) { filename = r->filename; } + /* Open the file */ if ((fd = popenf(r->pool, filename, O_RDONLY, 0)) == -1) { log_reason("file permissions deny server access", filename, r); return FORBIDDEN; *************** *** 546,551 **** --- 547,556 ---- return DECLINED; } + #else /* HAVE_MOD_DAV */ + + # define php3_type_checker NULL + #endif /* HAVE_MOD_DAV */ *************** *** 619,629 **** NULL, /* check_user_id */ NULL, /* check auth */ NULL, /* check access */ - #if HAVE_MOD_DAV php3_type_checker, /* type_checker */ - #else - NULL, /* type_checker */ - #endif NULL, /* fixups */ NULL /* logger */ #if MODULE_MAGIC_NUMBER >= 19970103 --- 624,630 ---- -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net