archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
80790 commits 526 branches 1434 tags 883 MiB
Commit graph

393 commits

Author SHA1 Message Date
Derick Rethans
0e5f475f5e Merge branch 'PHP-5.5' into PHP-5.6 2014-10-04 15:59:17 +01:00
Derick Rethans
0874ef624c Merge branch 'PHP-5.4' into PHP-5.5 2014-10-04 15:58:40 +01:00
Florian MARGAINE
046c345de5 DateTimeZone::getOffset() now accepts a DateTimeInterface 
Fixes #68062
 2014-10-04 15:58:24 +01:00
Tjerk Meesters
7fbc99e390 Some changes were lost in the merge commit of #66091 2014-08-13 20:57:10 +08:00
Tjerk Meesters
4b85f1d46a Fixed #66091 2014-08-13 20:24:43 +08:00
Tjerk Meesters
4647016abe Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS for #66091
  Fixed #66091

Conflicts:
	ext/date/php_date.c
 2014-08-13 20:20:10 +08:00
Tjerk Meesters
c5f619ba6f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed #66091

Conflicts:
	ext/date/php_date.c
 2014-08-13 20:15:52 +08:00
Tjerk Meesters
f6896e4395 Fixed #66091 2014-08-13 20:12:42 +08:00
Lior Kaplan
c186ce8fef Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Enable build without atoll (e.g old AIX flavours)
 2014-07-17 23:09:54 +03:00
Lior Kaplan
3e1b749f5e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Enable build without atoll (e.g old AIX flavours)
 2014-07-17 23:04:23 +03:00
Lior Kaplan
2dff153b23 Enable build without atoll (e.g old AIX flavours) 2014-07-17 22:58:36 +03:00
Remi Collet
2b3f4cc29e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
 2014-06-05 13:46:41 +02:00
Remi Collet
9ea9064779 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix regression introduce in fix for bug #67118
 2014-06-05 13:45:57 +02:00
Remi Collet
1fe9f1e4f5 Fix regression introduce in fix for bug #67118 
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.
 2014-06-05 13:39:46 +02:00
Adam Harvey
549331a925 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add microseconds to the serialised form of DateTime objects.
 2014-05-21 15:05:08 -05:00
Adam Harvey
d39377924c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add microseconds to the serialised form of DateTime objects.
 2014-05-21 15:03:24 -05:00
Adam Harvey
fdb2709dd2 Add microseconds to the serialised form of DateTime objects. 
Fixes bug #67308 (Serialize of DateTime truncates fractions of second).
 2014-05-21 14:55:52 -05:00
Anatol Belski
6448916535 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #67118 DateTime constructor crash with invalid data
 2014-04-25 17:26:20 +02:00
Anatol Belski
cc9f02751b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67118 DateTime constructor crash with invalid data
 2014-04-25 17:24:58 +02:00
Anatol Belski
c1aa9baf29 Fixed bug #67118 DateTime constructor crash with invalid data 2014-04-25 17:23:26 +02:00
Stanislav Malyshev
d3c4292db7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66721
 2014-04-13 15:55:45 -07:00
Stanislav Malyshev
733b09442d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66721
 2014-04-13 15:55:07 -07:00
Boro Sitnikovski
8c88b6e81c Fix bug #66721 
Add NULL check to php_date_parse_tzfile's retval
 2014-04-13 15:51:55 -07:00
Derick Rethans
574f230d3c Added DateTimeImmutable::createFromMutable. 2014-03-02 14:18:44 -05:00
Derick Rethans
39e721cf50 Fixed ZTS and added fix to NEWS. 2014-02-11 11:27:01 +00:00
Derick Rethans
d676396435 Implemented feature #45528: Allow the DateTimeZone constructor to accept timezones per offset too. 2014-02-09 15:47:48 -05:00
Derick Rethans
7399386a20 Merge branch 'PHP-5.4' into PHP-5.5 2014-01-26 14:02:37 +01:00
Derick Rethans
22dba2f5f3 Fixed bug #45543: DateTime::setTimezone can not set timezones without ID. 2014-01-26 14:01:58 +01:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Derick Rethans
5137cb5f0c Fixed (some of) add/sub. 
This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable
this code was not correctly merged.
 2014-01-02 12:45:48 +00:00
nikita2206
5f09944662 Fixed bug #65768: DateTimeImmutable::diff does not work 
This commit also prevents user classes from directly implementing
DateTimeInterface, because ext/date relies on classes implementing
it to support certain internal structures.
 2013-11-29 23:31:07 +01:00
Derick Rethans
88067b6e60 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/date/php_date.c
 2013-11-28 14:30:08 +00:00
Derick Rethans
5d0c526199 Move add/sub to timelib. 2013-11-28 12:02:36 +00:00
Derick Rethans
44a9e6b484 Fixed "Forward Transition" construction of DateTime objects. 
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.
 2013-11-28 12:02:35 +00:00
Derick Rethans
4587ef569a Merge branch 'PHP-5.4' into PHP-5.5 2013-11-27 22:01:03 +00:00
Derick Rethans
23ab2575e1 Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date) 2013-11-27 21:59:46 +00:00
Stanislav Malyshev
cb47396d46 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix memory leak on error (from Coverity scan)
 2013-10-21 00:02:21 -07:00
Stanislav Malyshev
f860486de5 fix memory leak on error (from Coverity scan) 2013-10-21 00:01:24 -07:00
Boro Sitnikovski
165f544ae9 Fix bug #65502: DateTimeImmutable::createFromFormat returns DateTime 
DateTimeImmutable::createFromFormat should call
date_create_immutable_from_format instead of date_create_from_format
 2013-09-12 15:21:45 +02:00
Boro Sitnikovski
d7f5f1ef35 Fix bug #65548: Comparison for DateTimeImmutable doesn't work 2013-09-12 15:12:16 +02:00
Remi Collet
6fab1caa41 Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer 2013-08-30 10:45:33 +02:00
Remi Collet
a5749eb0cb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
 2013-08-30 10:43:12 +02:00
Remi Collet
d69513afec Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer 2013-08-30 10:42:08 +02:00
Stanislav Malyshev
c0bfccafd2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix DateInterval->days value when object was created not from DateTime::diff()
 2013-08-24 23:38:54 -07:00
Alexander Moskalev
b378b0b081 Fix DateInterval->days value when object was created not from DateTime::diff() 2013-08-24 23:38:33 -07:00
Christopher Jones
39612afc72 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/dba/libinifile/inifile.c
 2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489 Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. 2013-08-14 20:36:50 -07:00
Stanislav Malyshev
c793a65690 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
 2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00