You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@apache.org on 2002/04/13 14:02:38 UTC
cvs commit: httpd-2.0/server util.c util_time.c
striker 02/04/13 05:02:38
Modified: modules/generators mod_autoindex.c
modules/mappers mod_rewrite.c
modules/ssl ssl_engine_log.c
server util.c util_time.c
Log:
Adapt to the rename of apr_explode_localtime to apr_time_exp_lt in APR.
Submitted by: Thom May <th...@planetarytramp.net>
Revision Changes Path
1.104 +2 -2 httpd-2.0/modules/generators/mod_autoindex.c
Index: mod_autoindex.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_autoindex.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- mod_autoindex.c 5 Apr 2002 17:50:37 -0000 1.103
+++ mod_autoindex.c 13 Apr 2002 12:02:37 -0000 1.104
@@ -1682,7 +1682,7 @@
if (ar[x]->lm != -1) {
char time_str[MAX_STRING_LEN];
apr_time_exp_t ts;
- apr_explode_localtime(&ts, ar[x]->lm);
+ apr_time_exp_lt(&ts, ar[x]->lm);
apr_strftime(time_str, &rv, MAX_STRING_LEN,
"</td><td align=\"right\">%d-%b-%Y %H:%M ", &ts);
ap_rputs(time_str, r);
@@ -1765,7 +1765,7 @@
if (ar[x]->lm != -1) {
char time_str[MAX_STRING_LEN];
apr_time_exp_t ts;
- apr_explode_localtime(&ts, ar[x]->lm);
+ apr_time_exp_lt(&ts, ar[x]->lm);
apr_strftime(time_str, &rv, MAX_STRING_LEN,
"%d-%b-%Y %H:%M ", &ts);
ap_rputs(time_str, r);
1.106 +4 -4 httpd-2.0/modules/mappers/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- mod_rewrite.c 5 Apr 2002 20:01:20 -0000 1.105
+++ mod_rewrite.c 13 Apr 2002 12:02:37 -0000 1.106
@@ -3244,7 +3244,7 @@
char tstr[80];
apr_size_t len;
- apr_explode_localtime(&t, apr_time_now());
+ apr_time_exp_lt(&t, apr_time_now());
apr_strftime(tstr, &len, 80, "[%d/%b/%Y:%H:%M:%S ", &t);
apr_snprintf(tstr + strlen(tstr), 80-strlen(tstr), "%c%.2d%.2d]",
@@ -3527,12 +3527,12 @@
/* XXX: wow this has gotta be slow if you actually use it for a lot, recalculates exploded time for each variable */
/* underlaying Unix system stuff */
else if (strcasecmp(var, "TIME_YEAR") == 0) {
- apr_explode_localtime(&tm, apr_time_now());
+ apr_time_exp_lt(&tm, apr_time_now());
apr_snprintf(resultbuf, sizeof(resultbuf), "%04d", tm.tm_year + 1900);
result = resultbuf;
}
#define MKTIMESTR(format, tmfield) \
- apr_explode_localtime(&tm, apr_time_now()); \
+ apr_time_exp_lt(&tm, apr_time_now()); \
apr_snprintf(resultbuf, sizeof(resultbuf), format, tm.tmfield); \
result = resultbuf;
else if (strcasecmp(var, "TIME_MON") == 0) {
@@ -3554,7 +3554,7 @@
MKTIMESTR("%d", tm_wday)
}
else if (strcasecmp(var, "TIME") == 0) {
- apr_explode_localtime(&tm, apr_time_now());
+ apr_time_exp_lt(&tm, apr_time_now());
apr_snprintf(resultbuf, sizeof(resultbuf),
"%04d%02d%02d%02d%02d%02d", tm.tm_year + 1900,
tm.tm_mon+1, tm.tm_mday,
1.17 +1 -1 httpd-2.0/modules/ssl/ssl_engine_log.c
Index: ssl_engine_log.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_log.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ssl_engine_log.c 28 Mar 2002 17:11:12 -0000 1.16
+++ ssl_engine_log.c 13 Apr 2002 12:02:38 -0000 1.17
@@ -212,7 +212,7 @@
if (add & SSL_NO_TIMESTAMP)
tstr[0] = NUL;
else {
- apr_explode_localtime(&t, apr_time_now());
+ apr_time_exp_lt(&t, apr_time_now());
apr_strftime(tstr, &len, 80, "[%d/%b/%Y %H:%M:%S", &t);
apr_snprintf(tstr + strlen(tstr), 80 - strlen(tstr), " %05d] ",
(unsigned int)getpid());
1.125 +1 -1 httpd-2.0/server/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- util.c 5 Apr 2002 04:22:45 -0000 1.124
+++ util.c 13 Apr 2002 12:02:38 -0000 1.125
@@ -180,7 +180,7 @@
fmt = tf;
}
else {
- apr_explode_localtime(&xt, t);
+ apr_time_exp_lt(&xt, t);
}
/* check return code? */
1.7 +3 -3 httpd-2.0/server/util_time.c
Index: util_time.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util_time.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- util_time.c 21 Mar 2002 10:10:41 -0000 1.6
+++ util_time.c 13 Apr 2002 12:02:38 -0000 1.7
@@ -133,7 +133,7 @@
return apr_time_exp_gmt(xt, t);
}
else {
- return apr_explode_localtime(xt, t);
+ return apr_time_exp_lt(xt, t);
}
}
else {
@@ -148,7 +148,7 @@
r = apr_time_exp_gmt(xt, t);
}
else {
- r = apr_explode_localtime(xt, t);
+ r = apr_time_exp_lt(xt, t);
}
if (!APR_STATUS_IS_SUCCESS(r)) {
return r;
@@ -177,7 +177,7 @@
AP_DECLARE(apr_status_t) ap_recent_ctime(char *date_str, apr_time_t t)
{
/* ### This code is a clone of apr_ctime(), except that it
- * uses ap_explode_recent_localtime() instead of apr_explode_localtime().
+ * uses ap_explode_recent_localtime() instead of apr_time_exp_lt().
*/
apr_time_exp_t xt;
const char *s;