From c41145799dcf94b198f76251f2a041195027a239 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Fri, 17 Jun 2005 14:54:00 +0000 Subject: [PATCH] - The incoming TS is GMT... but the hole filler wants local time so we have to convert it. - Change e-mail address --- ext/date/lib/dow.c | 2 +- ext/date/lib/parse_date.c | 2 +- ext/date/lib/parse_date.re | 2 +- ext/date/lib/parse_tz.c | 2 +- ext/date/lib/resource/parse_date.re | 2 +- ext/date/lib/timelib.c | 2 +- ext/date/lib/timelib.h | 2 +- ext/date/lib/timelib_structs.h | 4 ++-- ext/date/lib/tm2unixtime.c | 2 +- ext/date/lib/unixtime2tm.c | 2 +- ext/date/php_date.c | 4 ++-- ext/date/php_date.h | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ext/date/lib/dow.c b/ext/date/lib/dow.c index e317a11451..3a3b6bf368 100644 --- a/ext/date/lib/dow.c +++ b/ext/date/lib/dow.c @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Derick Rethans | + | Authors: Derick Rethans | +----------------------------------------------------------------------+ */ diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c index fca9d0d9be..df9ff203e4 100644 --- a/ext/date/lib/parse_date.c +++ b/ext/date/lib/parse_date.c @@ -14,7 +14,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Derick Rethans | + | Authors: Derick Rethans | +----------------------------------------------------------------------+ */ diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re index 6846348c16..47e600df08 100644 --- a/ext/date/lib/parse_date.re +++ b/ext/date/lib/parse_date.re @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Derick Rethans | + | Authors: Derick Rethans | +----------------------------------------------------------------------+ */ diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c index dc749cbc7e..4591c8f10f 100644 --- a/ext/date/lib/parse_tz.c +++ b/ext/date/lib/parse_tz.c @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Derick Rethans | + | Authors: Derick Rethans | +----------------------------------------------------------------------+ */ diff --git a/ext/date/lib/resource/parse_date.re b/ext/date/lib/resource/parse_date.re index 6846348c16..47e600df08 100644 --- a/ext/date/lib/resource/parse_date.re +++ b/ext/date/lib/resource/parse_date.re @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Derick Rethans | + | Authors: Derick Rethans | +----------------------------------------------------------------------+ */ diff --git a/ext/date/lib/timelib.c b/ext/date/lib/timelib.c index efa9e62ecd..1ab0a49fea 100644 --- a/ext/date/lib/timelib.c +++ b/ext/date/lib/timelib.c @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Derick Rethans | + | Authors: Derick Rethans | +----------------------------------------------------------------------+ */ diff --git a/ext/date/lib/timelib.h b/ext/date/lib/timelib.h index 53bd5c72f7..4827449ca1 100644 --- a/ext/date/lib/timelib.h +++ b/ext/date/lib/timelib.h @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Derick Rethans | + | Authors: Derick Rethans | +----------------------------------------------------------------------+ */ diff --git a/ext/date/lib/timelib_structs.h b/ext/date/lib/timelib_structs.h index 830595777c..9edcb2113d 100644 --- a/ext/date/lib/timelib_structs.h +++ b/ext/date/lib/timelib_structs.h @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Derick Rethans | + | Authors: Derick Rethans | +----------------------------------------------------------------------+ */ @@ -128,7 +128,7 @@ typedef struct timelib_time { int z; /* GMT offset in minutes */ char *tz_abbr; /* Timezone abbreviation (display only) */ timelib_tzinfo *tz_info; /* Timezone structure */ - unsigned int dst; /* Flag if we were parsing a DST zone */ + signed int dst; /* Flag if we were parsing a DST zone */ timelib_rel_time relative; timelib_sll sse; /* Seconds since epoch */ diff --git a/ext/date/lib/tm2unixtime.c b/ext/date/lib/tm2unixtime.c index 9e2b862f83..c6d9cff3f2 100644 --- a/ext/date/lib/tm2unixtime.c +++ b/ext/date/lib/tm2unixtime.c @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Derick Rethans | + | Authors: Derick Rethans | +----------------------------------------------------------------------+ */ diff --git a/ext/date/lib/unixtime2tm.c b/ext/date/lib/unixtime2tm.c index 0b536dc467..b6c2cc0b73 100644 --- a/ext/date/lib/unixtime2tm.c +++ b/ext/date/lib/unixtime2tm.c @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Derick Rethans | + | Authors: Derick Rethans | +----------------------------------------------------------------------+ */ diff --git a/ext/date/php_date.c b/ext/date/php_date.c index bbcd95e7fb..8296906fa3 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Derick Rethans | + | Authors: Derick Rethans | +----------------------------------------------------------------------+ */ @@ -119,7 +119,7 @@ PHP_FUNCTION(strtotime) snprintf(initial_ts, 24, "@%lu", preset_ts); t = timelib_strtotime(initial_ts); timelib_update_ts(t, tzi); - timelib_unixtime2gmt(now, t->sse); + timelib_unixtime2local(now, t->sse, tzi); timelib_time_dtor(t); efree(initial_ts); } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "s", ×, &time_len) != FAILURE) { diff --git a/ext/date/php_date.h b/ext/date/php_date.h index 91bd234944..67e890e14f 100644 --- a/ext/date/php_date.h +++ b/ext/date/php_date.h @@ -12,7 +12,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Derick Rethans | + | Authors: Derick Rethans | +----------------------------------------------------------------------+ */ -- 2.40.0