[mod-xhtml-neg-cvs] mod_xhtml_neg-2.0 mod_xhtml_neg.c,1.1.1.1,1.2
Brought to you by:
run2000
From: <ru...@us...> - 2004-03-13 08:19:17
|
Update of /cvsroot/mod-xhtml-neg/mod_xhtml_neg-2.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29307 Modified Files: mod_xhtml_neg.c Log Message: Fixed some stupid mistakes surrounding configuration. Index: mod_xhtml_neg.c =================================================================== RCS file: /cvsroot/mod-xhtml-neg/mod_xhtml_neg-2.0/mod_xhtml_neg.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** mod_xhtml_neg.c 13 Mar 2004 07:07:50 -0000 1.1.1.1 --- mod_xhtml_neg.c 13 Mar 2004 08:10:31 -0000 1.2 *************** *** 112,122 **** #include "http_log.h" ! static int xfer_flags = (O_WRONLY | O_APPEND | O_CREAT); ! #if defined(OS2) || defined(WIN32) || defined(NETWARE) ! /* OS/2 dosen't support users and groups */ ! static mode_t xfer_mode = (S_IREAD | S_IWRITE); ! #else ! static mode_t xfer_mode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); ! #endif /* #define MOD_XHTML_NEG_DEBUG 1 */ --- 112,117 ---- #include "http_log.h" ! static int xfer_flags = (APR_WRITE | APR_APPEND | APR_CREATE); ! static apr_fileperms_t xfer_perms = APR_OS_DEFAULT; /* #define MOD_XHTML_NEG_DEBUG 1 */ *************** *** 142,146 **** typedef struct { int active; /* Is the module active for this directory? */ ! apr_array_header_t *extensions; /* An array of extension_rec records */ int stars_ignore; /* How many content-type stars before we ignore */ --- 137,141 ---- typedef struct { int active; /* Is the module active for this directory? */ ! apr_array_header_t *extensions; /* An array of extension_rec records */ int stars_ignore; /* How many content-type stars before we ignore */ *************** *** 167,171 **** typedef struct { ! char *extension; /* Filename extension */ apr_array_header_t *content_types; /* Array of content accept headers */ } extension_rec; --- 162,166 ---- typedef struct { ! char *extension; /* Filename extension */ apr_array_header_t *content_types; /* Array of content accept headers */ } extension_rec; *************** *** 1208,1212 **** void *in_dir_config, int arg) { ! xhtml_dir_config *dir_config = (xhtml_dir_config *)dir_config; /* If we're here at all it's because someone explicitly --- 1203,1207 ---- void *in_dir_config, int arg) { ! xhtml_dir_config *dir_config = in_dir_config; /* If we're here at all it's because someone explicitly *************** *** 1250,1254 **** extension_rec *rec; accept_rec *new; ! xhtml_dir_config *dir_config = (xhtml_dir_config *)in_dir_config; char *content_type = apr_pstrdup( cmd->pool, type ); --- 1245,1249 ---- extension_rec *rec; accept_rec *new; ! xhtml_dir_config *dir_config = in_dir_config; char *content_type = apr_pstrdup( cmd->pool, type ); *************** *** 1339,1342 **** --- 1334,1338 ---- static void *create_xhtml_dir_config(apr_pool_t *p, char *dummy) { + xhtml_dir_config *new = (xhtml_dir_config *) apr_pcalloc(p, sizeof(xhtml_dir_config)); *************** *** 1416,1420 **** fd = NULL; ! if( apr_file_open(&fd, fname, xfer_flags, xfer_mode, pconf) != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "could not open log file %s.", fname); --- 1412,1416 ---- fd = NULL; ! if( apr_file_open(&fd, fname, xfer_flags, xfer_perms, pconf) != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "could not open log file %s.", fname); |