MFH: use library error message on time string parse failure

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 5aa3b8766ee2b179e5b958a8858c58bcdf00e0b4..debda7b0cf1b46319b157bcb3c51379a0fdbec95 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -1556,7 +1556,9 @@ static void date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, int
        dateobj->time = timelib_strtotime(time_str_len ? time_str : "now", time_str_len ? time_str_len : sizeof("now") -1, &err, DATE_TIMEZONEDB);
        if (err) {
                if (err->error_count) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse time string (%s)", time_str);
+                       /* spit out the first library error message, at least */
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse time string (%s) at position %d (%c): %s", time_str,
+                                                       err->error_messages[0].position, err->error_messages[0].character, err->error_messages[0].message);
                }
                timelib_error_container_dtor(err);
        }