Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.5' into PHP-5.6 | Derick Rethans | 2014-10-04 | 1 | -4/+4 |
|\ | |||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Derick Rethans | 2014-10-04 | 1 | -4/+4 |
| |\ | |||||
| | * | DateTimeZone::getOffset() now accepts a DateTimeInterface | Florian MARGAINE | 2014-10-04 | 1 | -4/+4 |
| | | | | | | | | | | | | Fixes #68062 | ||||
| * | | Some changes were lost in the merge commit of #66091 | Tjerk Meesters | 2014-08-13 | 1 | -4/+14 |
| | | | |||||
| * | | Fixed #66091 | Tjerk Meesters | 2014-08-13 | 1 | -12/+18 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Tjerk Meesters | 2014-08-13 | 1 | -16/+24 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Updated NEWS for #66091 Fixed #66091 Conflicts: ext/date/php_date.c | ||||
| * \ \ | Merge branch 'PHP-5.4' into PHP-5.5 | Tjerk Meesters | 2014-08-13 | 1 | -16/+32 |
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | * PHP-5.4: Fixed #66091 Conflicts: ext/date/php_date.c | ||||
| | * | Fixed #66091 | Tjerk Meesters | 2014-08-13 | 1 | -11/+17 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Lior Kaplan | 2014-07-17 | 1 | -0/+4 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: Enable build without atoll (e.g old AIX flavours) | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Lior Kaplan | 2014-07-17 | 1 | -0/+4 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: Enable build without atoll (e.g old AIX flavours) | ||||
| | * | Enable build without atoll (e.g old AIX flavours) | Lior Kaplan | 2014-07-17 | 1 | -0/+4 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Remi Collet | 2014-06-05 | 1 | -3/+3 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: NEWS NEWS Fix regression introduce in fix for bug #67118 | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2014-06-05 | 1 | -3/+3 |
| |\ \ | | |/ | | | | | | | | | | | | | * PHP-5.4: NEWS Fix regression introduce in fix for bug #67118 | ||||
| | * | Fix regression introduce in fix for bug #67118 | Remi Collet | 2014-06-05 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix was correct but break some code (at least in Horde) This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6 This make php_date_initialize more consistent - on success return 1 + time initiliazed - on failure return 0 + time = zero which is check by DATE_CHECK_INITIALIZED by later method call Will restore consistency with other date classes in master. | ||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Adam Harvey | 2014-05-21 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: Add microseconds to the serialised form of DateTime objects. | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Adam Harvey | 2014-05-21 | 1 | -1/+1 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: Add microseconds to the serialised form of DateTime objects. | ||||
| | * | Add microseconds to the serialised form of DateTime objects. | Adam Harvey | 2014-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | Fixes bug #67308 (Serialize of DateTime truncates fractions of second). | ||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Anatol Belski | 2014-04-25 | 1 | -1/+3 |
|\ \ \ | |/ / | | | | | | | | | | | | | * PHP-5.5: updated NEWS Fixed bug #67118 DateTime constructor crash with invalid data | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Anatol Belski | 2014-04-25 | 1 | -1/+3 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: Fixed bug #67118 DateTime constructor crash with invalid data | ||||
| | * | Fixed bug #67118 DateTime constructor crash with invalid data | Anatol Belski | 2014-04-25 | 1 | -1/+3 |
| | | | |||||
* | | | Merge branch 'PHP-5.5' into PHP-5.6 | Stanislav Malyshev | 2014-04-13 | 1 | -0/+4 |
|\ \ \ | |/ / | | | | | | | | | | * PHP-5.5: Fix bug #66721 | ||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2014-04-13 | 1 | -0/+4 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: Fix bug #66721 | ||||
| | * | Fix bug #66721 | Boro Sitnikovski | 2014-04-13 | 1 | -0/+4 |
| | | | | | | | | | | | | Add NULL check to php_date_parse_tzfile's retval | ||||
* | | | Added DateTimeImmutable::createFromMutable. | Derick Rethans | 2014-03-02 | 1 | -0/+33 |
|/ / | |||||
* | | Fixed ZTS and added fix to NEWS. | Derick Rethans | 2014-02-11 | 1 | -1/+1 |
| | | |||||
* | | Implemented feature #45528: Allow the DateTimeZone constructor to accept ↵ | Derick Rethans | 2014-02-09 | 1 | -72/+40 |
| | | | | | | | | timezones per offset too. | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Derick Rethans | 2014-01-26 | 1 | -4/+11 |
|\ \ | |/ | |||||
| * | Fixed bug #45543: DateTime::setTimezone can not set timezones without ID. | Derick Rethans | 2014-01-26 | 1 | -4/+11 |
| | | |||||
| * | Bump year | Xinchen Hui | 2014-01-03 | 1 | -1/+1 |
| | | |||||
* | | Bump year | Xinchen Hui | 2014-01-03 | 1 | -1/+1 |
| | | |||||
* | | Fixed (some of) add/sub. | Derick Rethans | 2014-01-02 | 1 | -40/+8 |
| | | | | | | | | | | This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable this code was not correctly merged. | ||||
* | | Fixed bug #65768: DateTimeImmutable::diff does not work | nikita2206 | 2013-11-29 | 1 | -4/+17 |
| | | | | | | | | | | | | This commit also prevents user classes from directly implementing DateTimeInterface, because ext/date relies on classes implementing it to support certain internal structures. | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Derick Rethans | 2013-11-28 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | Conflicts: ext/date/php_date.c | ||||
| * | Move add/sub to timelib. | Derick Rethans | 2013-11-28 | 1 | -41/+8 |
| | | |||||
| * | Fixed "Forward Transition" construction of DateTime objects. | Derick Rethans | 2013-11-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | This fixes the issue in https://wiki.php.net/rfc/datetime_and_daylight_saving_time#forward_transitions There is a period during transition to DST where a time (such as 02:30) does not exist. PHP already calculated the correct timestamp for this, but failed to "rounded forward" to the existing correct hour value. | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Derick Rethans | 2013-11-27 | 1 | -2/+10 |
|\ \ | |/ | |||||
| * | Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie ↵ | Derick Rethans | 2013-11-27 | 1 | -2/+10 |
| | | | | | | | | expiration date) | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-10-21 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | * PHP-5.4: fix memory leak on error (from Coverity scan) | ||||
| * | fix memory leak on error (from Coverity scan) | Stanislav Malyshev | 2013-10-21 | 1 | -0/+1 |
| | | |||||
* | | Fix bug #65502: DateTimeImmutable::createFromFormat returns DateTime | Boro Sitnikovski | 2013-09-12 | 1 | -1/+1 |
| | | | | | | | | | | DateTimeImmutable::createFromFormat should call date_create_immutable_from_format instead of date_create_from_format | ||||
* | | Fix bug #65548: Comparison for DateTimeImmutable doesn't work | Boro Sitnikovski | 2013-09-12 | 1 | -19/+13 |
| | | |||||
* | | Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by ↵ | Remi Collet | 2013-08-30 | 1 | -2/+2 |
| | | | | | | | | AddressSanitizer | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Remi Collet | 2013-08-30 | 1 | -5/+5 |
|\ \ | |/ | | | | | | | * PHP-5.4: Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer | ||||
| * | Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by ↵ | Remi Collet | 2013-08-30 | 1 | -5/+5 |
| | | | | | | | | AddressSanitizer | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-08-24 | 1 | -1/+5 |
|\ \ | |/ | | | | | | | * PHP-5.4: Fix DateInterval->days value when object was created not from DateTime::diff() | ||||
| * | Fix DateInterval->days value when object was created not from DateTime::diff() | Alexander Moskalev | 2013-08-24 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Christopher Jones | 2013-08-14 | 1 | -3/+3 |
|\ \ | |/ | | | | | | | | | | | | | * PHP-5.4: Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. Conflicts: ext/dba/libinifile/inifile.c | ||||
| * | Reduce (some) compile noise of 'unused variable' and 'may be used ↵ | Christopher Jones | 2013-08-14 | 1 | -3/+3 |
| | | | | | | | | uninitialized' warnings. | ||||
* | | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2013-08-04 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | | | * PHP-5.4: non living code related typo fixes Conflicts: Zend/zend_compile.c | ||||
| * | non living code related typo fixes | Veres Lajos | 2013-08-04 | 1 | -1/+1 |
| | |