- The incoming TS is GMT... but the hole filler wants local time so we

  have to convert it.
- Change e-mail address

diff --git a/ext/date/lib/dow.c b/ext/date/lib/dow.c
index e317a1145116280490bd9f80d5f4778c34fc7fe6..3a3b6bf368ce1d55b9d1719794575e80ec80e8ff 100644 (file)
--- 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 <dr@ez.no>                                   |
+   | Authors: Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
  */
 

diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index fca9d0d9be273a047ba438988d9b131d4ba82b3b..df9ff203e4355c8a303d0921538061d27569abb8 100644 (file)
--- 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 <dr@ez.no>                                   |
+   | Authors: Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
  */
 

diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index 6846348c16f70d1b3d9c65e3e43b4a8d26f4fc4c..47e600df08e97c354646e5eedbc0c72fb4fafe28 100644 (file)
--- 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 <dr@ez.no>                                   |
+   | Authors: Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
  */
 

diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
index dc749cbc7ef38bdc6a73e5da10bc018f1b3032cc..4591c8f10f707e2c5057752512736abf644fa8b8 100644 (file)
--- 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 <dr@ez.no>                                   |
+   | Authors: Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
  */
 

diff --git a/ext/date/lib/resource/parse_date.re b/ext/date/lib/resource/parse_date.re
index 6846348c16f70d1b3d9c65e3e43b4a8d26f4fc4c..47e600df08e97c354646e5eedbc0c72fb4fafe28 100644 (file)
--- 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 <dr@ez.no>                                   |
+   | Authors: Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
  */
 

diff --git a/ext/date/lib/timelib.c b/ext/date/lib/timelib.c
index efa9e62ecd50606e818c7b9b4c0967ff769dc129..1ab0a49feaff2cd28bc9328017e44eba7b82a4b6 100644 (file)
--- 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 <dr@ez.no>                                   |
+   | Authors: Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
  */
 

diff --git a/ext/date/lib/timelib.h b/ext/date/lib/timelib.h
index 53bd5c72f7494442a9d4de683aa179da4d7b7449..4827449ca16d3fb72b6785ebdde5742325c874a8 100644 (file)
--- 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 <dr@ez.no>                                   |
+   | Authors: Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
  */
 

diff --git a/ext/date/lib/timelib_structs.h b/ext/date/lib/timelib_structs.h
index 830595777cecce3c9a2340b16624d6dc2ee212d3..9edcb2113d0a0ba284b780d1d09ee56caac99101 100644 (file)
--- 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 <dr@ez.no>                                   |
+   | Authors: Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
  */
 
@@ -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 9e2b862f83f57061eeec007cdffcbe85d5a61438..c6d9cff3f2dcb861f9d12bdcac1556311e3d1de4 100644 (file)
--- 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 <dr@ez.no>                                   |
+   | Authors: Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
  */
 

diff --git a/ext/date/lib/unixtime2tm.c b/ext/date/lib/unixtime2tm.c
index 0b536dc467751de0fff7b7a28497b487ed861493..b6c2cc0b73cf9e7ed9312497742421a8de7f7281 100644 (file)
--- 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 <dr@ez.no>                                   |
+   | Authors: Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
  */
 

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index bbcd95e7fbee3efd8c02823dd552e30a59b8cadd..8296906fa380ff10b9e3c03a35114397c769b84a 100644 (file)
--- 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 <dr@ez.no>                                   |
+   | Authors: Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
  */
 
@@ -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", &times, &time_len) != FAILURE) {

diff --git a/ext/date/php_date.h b/ext/date/php_date.h
index 91bd2349442df3f5c5745dd118a4191f6f2c16f3..67e890e14fcaa69c2c6d150c56aaa61ceda8e78b 100644 (file)
--- 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 <dr@ez.no>                                   |
+   | Authors: Derick Rethans <derick@derickrethans.nl>                    |
    +----------------------------------------------------------------------+
 */