Merge branch 'PHP-5.6'

Conflicts:
	ext/date/lib/parse_date.c
	ext/date/php_date.c

diff --cc ext/date/lib/parse_date.c
Simple merge

diff --cc ext/date/lib/parse_date.re
Simple merge

diff --cc ext/date/lib/timelib.h
Simple merge

diff --cc ext/date/lib/tm2unixtime.c
Simple merge

diff --cc ext/date/php_date.c
index 94d3a19bcd7995d6ac3d699ffc2ac0c9133bee03,c892c86da1b7bd88e0b8cfd892b41356a053da40..b3f6a27c9d098bd62e52c3adff2121b59bbbad68
--- 1/ext/date/php_date.c
--- 2/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -2953,26 -3035,27 +2953,26 @@@ void php_date_do_return_parsed_time(INT
                }
        }
        if (parsed_time->have_relative) {
 -              MAKE_STD_ZVAL(element);
 -              array_init(element);
 -              add_assoc_long(element, "year",   parsed_time->relative.y);
 -              add_assoc_long(element, "month",  parsed_time->relative.m);
 -              add_assoc_long(element, "day",    parsed_time->relative.d);
 -              add_assoc_long(element, "hour",   parsed_time->relative.h);
 -              add_assoc_long(element, "minute", parsed_time->relative.i);
 -              add_assoc_long(element, "second", parsed_time->relative.s);
 +              array_init(&element);
 +              add_assoc_long(&element, "year",   parsed_time->relative.y);
 +              add_assoc_long(&element, "month",  parsed_time->relative.m);
 +              add_assoc_long(&element, "day",    parsed_time->relative.d);
 +              add_assoc_long(&element, "hour",   parsed_time->relative.h);
 +              add_assoc_long(&element, "minute", parsed_time->relative.i);
 +              add_assoc_long(&element, "second", parsed_time->relative.s);
                if (parsed_time->relative.have_weekday_relative) {
 -                      add_assoc_long(element, "weekday", parsed_time->relative.weekday);
 +                      add_assoc_long(&element, "weekday", parsed_time->relative.weekday);
                }
                if (parsed_time->relative.have_special_relative && (parsed_time->relative.special.type == TIMELIB_SPECIAL_WEEKDAY)) {
 -                      add_assoc_long(element, "weekdays", parsed_time->relative.special.amount);
 +                      add_assoc_long(&element, "weekdays", parsed_time->relative.special.amount);
                }
                if (parsed_time->relative.first_last_day_of) {
-                       add_assoc_bool(&element, parsed_time->relative.first_last_day_of == 1 ? "first_day_of_month" : "last_day_of_month", 1);
 -                      add_assoc_bool(element, parsed_time->relative.first_last_day_of == TIMELIB_SPECIAL_FIRST_DAY_OF_MONTH ? "first_day_of_month" : "last_day_of_month", 1);
++                      add_assoc_bool(&element, parsed_time->relative.first_last_day_of == TIMELIB_SPECIAL_FIRST_DAY_OF_MONTH ? "first_day_of_month" : "last_day_of_month", 1);
                }
 -              add_assoc_zval(return_value, "relative", element);
 +              add_assoc_zval(return_value, "relative", &element);
        }
        timelib_time_dtor(parsed_time);
 -}
 +} /* }}} */
  
  /* {{{ proto array date_parse(string date)
     Returns associative array with detailed info about given date