richter 2003/02/26 23:48:08
Modified: . eppriv.h eputil.c mod_embperl.c
test/conf startup.pl
Log:
fix EXPIRES config
Revision Changes Path
1.5 +2 -2 embperl/eppriv.h
Index: eppriv.h
===================================================================
RCS file: /home/cvs/embperl/eppriv.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eppriv.h 14 Feb 2003 22:54:03 -0000 1.4
+++ eppriv.h 27 Feb 2003 07:48:08 -0000 1.5
@@ -232,7 +232,7 @@
/*in*/ const char * sOptions,
/*in*/ int * pnValue) ;
-char * embperl_CalcExpires(char *sTime, char * sResult, int bHTTP) ;
+const char * embperl_CalcExpires(const char *sTime, char * sResult, int bHTTP) ;
1.33 +5 -4 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- eputil.c 27 Feb 2003 07:05:32 -0000 1.32
+++ eputil.c 27 Feb 2003 07:48:08 -0000 1.33
@@ -1953,7 +1953,7 @@
};
}
-static time_t expire_calc(char *time_str)
+static time_t expire_calc(const char *time_str)
{
int is_neg = 0, offset = 0;
char buf[256];
@@ -1993,7 +1993,7 @@
};
-char * embperl_CalcExpires(char *sTime, char * sResult, int bHTTP)
+const char * embperl_CalcExpires(const char *sTime, char * sResult, int bHTTP)
{
time_t when;
struct tm *tms;
@@ -2011,12 +2011,13 @@
}
tms = gmtime(&when);
- return sprintf(sResult,
+ sprintf(sResult,
"%s, %.2d%c%s%c%.2d %.2d:%.2d:%.2d GMT",
ep_day_snames[tms->tm_wday],
tms->tm_mday, sep, ep_month_snames[tms->tm_mon], sep,
tms->tm_year + 1900,
tms->tm_hour, tms->tm_min, tms->tm_sec);
+ return sResult ;
}
1.9 +4 -2 embperl/mod_embperl.c
Index: mod_embperl.c
===================================================================
RCS file: /home/cvs/embperl/mod_embperl.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_embperl.c 15 Feb 2003 20:46:32 -0000 1.8
+++ mod_embperl.c 27 Feb 2003 07:48:08 -0000 1.9
@@ -627,7 +627,7 @@
char buf[256] ; \
if (!embperl_CalcExpires(arg, buf, 0)) \
LogErrorParam (NULL, rcTimeFormatErr, "EMBPERL_"#CFGNAME, arg) ; \
- else \
+ else \
((tApacheDirConfig *)pDirCfg) -> STRUCT.NAME = ap_pstrdup(p, buf) ; \
((tApacheDirConfig *)pDirCfg) -> set_##STRUCT##NAME = 1 ; \
if (bApDebug) \
@@ -695,10 +695,12 @@
#undef EPCFG_STR
#undef EPCFG_INT
+#undef EPCFG_EXPIRES
#undef EPCFG_INTOPT
#undef EPCFG_BOOL
#undef EPCFG_CHAR
#define EPCFG_INT EPCFG
+#define EPCFG_EXPIRES EPCFG_STR
#define EPCFG_INTOPT EPCFG
#define EPCFG_BOOL EPCFG
#define EPCFG_CHAR EPCFG
1.19 +1 -1 embperl/test/conf/startup.pl
Index: startup.pl
===================================================================
RCS file: /home/cvs/embperl/test/conf/startup.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- startup.pl 27 Feb 2003 07:05:33 -0000 1.18
+++ startup.pl 27 Feb 2003 07:48:08 -0000 1.19
@@ -31,7 +31,7 @@
}
else
{
- use Apache2 ;
+ eval 'use Apache2' ;
require ModPerl::Registry ;
}
} ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
