Hi,
here is the patch for httpd-2.0 to rename apr_explode_gmt to
apr_time_exp_gmt in line with the patch I just sent to apr.
Cheers,
-Thom
Index: include/util_time.h
===================================================================
RCS file: /home/cvspublic/httpd-2.0/include/util_time.h,v
retrieving revision 1.4
diff -u -u -3 -r1.4 util_time.h
--- include/util_time.h 17 Mar 2002 05:13:12 -0000 1.4
+++ include/util_time.h 17 Mar 2002 23:43:04 -0000
@@ -92,7 +92,7 @@
* @param tm the exploded time
* @param t the time to explode: MUST be within the last
* AP_TIME_RECENT_THRESHOLD seconds
- * @note This is a faster alternative to apr_explode_gmt that uses
+ * @note This is a faster alternative to apr_time_exp_gmt that uses
* a cache of pre-exploded time structures. It is useful for things
* that need to explode the current time multiple times per second,
* like loggers.
Index: modules/dav/fs/repos.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/dav/fs/repos.c,v
retrieving revision 1.66
diff -u -u -3 -r1.66 repos.c
--- modules/dav/fs/repos.c 13 Mar 2002 20:47:45 -0000 1.66
+++ modules/dav/fs/repos.c 17 Mar 2002 23:43:18 -0000
@@ -306,7 +306,7 @@
apr_time_exp_t tms;
/* ### what to do if fails? */
- (void) apr_explode_gmt(&tms, sec);
+ (void) apr_time_exp_gmt(&tms, sec);
if (style == DAV_STYLE_ISO8601) {
/* ### should we use "-00:00" instead of "Z" ?? */
Index: modules/metadata/mod_usertrack.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/modules/metadata/mod_usertrack.c,v
retrieving revision 1.36
diff -u -u -3 -r1.36 mod_usertrack.c
--- modules/metadata/mod_usertrack.c 13 Mar 2002 20:47:53 -0000 1.36
+++ modules/metadata/mod_usertrack.c 17 Mar 2002 23:43:26 -0000
@@ -156,7 +156,7 @@
if ((dcfg->style == CT_UNSET) || (dcfg->style == CT_NETSCAPE)) {
apr_time_exp_t tms;
- apr_explode_gmt(&tms, r->request_time
+ apr_time_exp_gmt(&tms, r->request_time
+ cls->expires * APR_USEC_PER_SEC);
new_cookie = apr_psprintf(r->pool,
"%s; expires=%s, "
Index: server/util.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/util.c,v
retrieving revision 1.121
diff -u -u -3 -r1.121 util.c
--- server/util.c 13 Mar 2002 20:48:00 -0000 1.121
+++ server/util.c 17 Mar 2002 23:43:44 -0000
@@ -148,7 +148,7 @@
const char *f;
char *strp;
- apr_explode_gmt(&xt, t);
+ apr_time_exp_gmt(&xt, t);
/* Convert %Z to "GMT" and %z to "+0000";
* on hosts that do not have a time zone string in struct tm,
* strftime must assume its argument is local time.
Index: server/util_time.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/server/util_time.c,v
retrieving revision 1.5
diff -u -u -3 -r1.5 util_time.c
--- server/util_time.c 17 Mar 2002 05:13:12 -0000 1.5
+++ server/util_time.c 17 Mar 2002 23:43:48 -0000
@@ -130,7 +130,7 @@
(seconds != cache_element_snapshot.t_validate)) {
/* Invalid snapshot */
if (use_gmt) {
- return apr_explode_gmt(xt, t);
+ return apr_time_exp_gmt(xt, t);
}
else {
return apr_explode_localtime(xt, t);
@@ -145,7 +145,7 @@
else {
apr_status_t r;
if (use_gmt) {
- r = apr_explode_gmt(xt, t);
+ r = apr_time_exp_gmt(xt, t);
}
else {
r = apr_explode_localtime(xt, t);
Index: support/rotatelogs.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/support/rotatelogs.c,v
retrieving revision 1.19
diff -u -u -3 -r1.19 rotatelogs.c
--- support/rotatelogs.c 13 Mar 2002 20:48:06 -0000 1.19
+++ support/rotatelogs.c 17 Mar 2002 23:43:56 -0000
@@ -164,7 +164,7 @@
apr_time_exp_t e;
apr_size_t rs;
- apr_explode_gmt(&e, tNow);
+ apr_time_exp_gmt(&e, tNow);
apr_strftime(buf2, &rs, sizeof(buf2), szLogRoot, &e);
}
else {
