clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,561 Commits 494 Branches 1,367 Tags 807 MiB
b0159431e3
Commit Graph

476 Commits

Author SHA1 Message Date
Remi Collet
28d215d0a8 Fixed bug #66060 (Heap buffer over-read in DateInterval) 2013-11-27 11:15:08 +01:00
Remi Collet
12fe4e90be Fixed bug #66060 (Heap buffer over-read in DateInterval) 2013-11-27 11:13:16 +01:00
Derick Rethans
ad7793d94c Merge branch 'PHP-5.4' into PHP-5.5 2013-10-28 15:12:31 +01:00
Derick Rethans
ab6481993e - Updated to version 2013.8 (2013h) 2013-10-28 15:12:30 +01:00
Derick Rethans
bb73d18c85 Merge branch 'PHP-5.4' into PHP-5.5 2013-10-23 22:33:54 +01:00
Derick Rethans
9cb3a759a7 - Updated to version 2013.7 (2013g) 2013-10-23 22:33:53 +01:00
Derick Rethans
ea0f832f10 Merge branch 'PHP-5.4' into PHP-5.5 2013-09-27 10:14:47 +01:00
Derick Rethans
7a1a1aec8c - Updated to version 2013.6 (2013f) 2013-09-27 10:14:46 +01:00
David Soria Parra
3d6ac70e66 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
 2013-09-16 23:36:37 +02:00
Boro Sitnikovski
a475b2c1db Bug 64157 
Changed error message to make sense
 2013-09-16 03:42:49 +02:00
Stanislav Malyshev
825a505494 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end

Conflicts:
	ext/date/lib/parse_date.c
	ext/date/lib/parse_date.re
 2013-08-25 15:14:17 -07:00
gron1987
e6424d89e9 Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end 2013-08-25 15:09:29 -07:00
Derick Rethans
06cef326fd Merge branch 'PHP-5.4' into PHP-5.5 2013-07-09 09:07:17 +01:00
Derick Rethans
c7ee677f2f - Updated to version 2013.4 (2013d) 2013-07-09 09:07:16 +01:00
David Soria Parra
b86c85723e Fix #64711 ("value computed but not used" in parse_date.c) 2013-04-26 11:33:54 +02:00
Derick Rethans
0b2c411323 Merge branch 'PHP-5.3' into PHP-5.4 2013-04-22 17:51:43 +01:00
Derick Rethans
70b67f2e50 - Updated to version 2013.3 (2013c) 2013-04-22 17:51:41 +01:00
Derick Rethans
0720804e7c Merge branch 'PHP-5.4' into PHP-5.5 2013-04-22 17:51:47 +01:00
EC2 Default User
b07ecb5501 Bug #60774 (DateInterval::format("%a") is always zero when an interval is 
created using the createFromDateString method)
 2013-03-31 10:59:21 +01:00
Derick Rethans
84208d9dc5 Added the new .c files as well as they are not automatically regenerated. 2013-03-31 10:55:45 +01:00
Lonny Kapelushnik
58a8013e5f Rebased to PHP-5.4 
Implemented Dmitrys change from df97c3aa0d
Moved the timelib_parse_tz_cor function to ext/date/lib/timelib.c
 2013-03-31 10:45:01 +01:00
Lonny Kapelushnik
a4ca01cc2b Made separate tests for each TZ type 
Fixed handling of unserializing types 1 and 3
 2013-03-31 10:45:00 +01:00
Derick Rethans
e5c64c0bda Merge branch 'PHP-5.4' into PHP-5.5 2013-03-11 21:36:41 +00:00
Derick Rethans
98bb5f4798 Merge branch 'PHP-5.3' into PHP-5.4 2013-03-11 21:36:37 +00:00
Derick Rethans
50ad2af503 - Updated to version 2013.2 (2013b) 2013-03-11 21:36:36 +00:00
Derick Rethans
c596850af6 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-03-03 12:58:42 -05:00
Derick Rethans
a3f020a4be Merge branch 'PHP-5.3' into PHP-5.4 2013-03-03 12:53:23 -05:00
Derick Rethans
c134f2a1a5 - Updated to version 2013.1 (2013a) 2013-03-03 12:53:22 -05:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Sebastian Bergmann
eab14993fe Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files. 2012-12-06 09:28:35 +01:00
Derick Rethans
dae05b2973 Merge branch 'PHP-5.4' 2012-11-13 10:17:21 +00:00
Derick Rethans
4f36aeb120 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	NEWS
 2012-11-13 10:16:58 +00:00
Derick Rethans
00ad4c0e6a - Updated to version 2012.10 (2012j) 2012-11-13 10:15:34 +00:00
Derick Rethans
37cc133d6f Merge branch 'PHP-5.4' 2012-11-04 16:24:07 +00:00
Derick Rethans
db0f623490 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-04 16:24:02 +00:00
Derick Rethans
1784279be0 - Updated to version 2012.9 (2012i) 2012-11-04 16:23:58 +00:00
Derick Rethans
c511ee3d64 Merge branch 'PHP-5.4' 2012-10-27 15:19:59 +01:00
Derick Rethans
4c08ee069c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-27 15:19:55 +01:00
Derick Rethans
b5344e267a - Updated to version 2012.8 (2012h) 2012-10-27 15:19:54 +01:00
Derick Rethans
51fe5bcd09 Merge branch 'PHP-5.4' 2012-10-18 21:53:08 +01:00
Derick Rethans
4980b24025 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 21:53:04 +01:00
Derick Rethans
8f7a6c3029 - Updated to version 2012.7 (2012g) 2012-10-18 21:53:03 +01:00
Derick Rethans
34eb787828 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2012-10-04 08:39:21 +01:00
Stanislav Malyshev
40bb9254c5 Merge branch 'pull-request/210' into PHP-5.4 
* pull-request/210:
  Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour) Prevent a unix timestamp, which is always GMT when being parsed, from taking on the local timezones DST flag.
 2012-09-30 20:19:36 -07:00
Lonny Kapelushnik
b3469560f3 Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour) 
Prevent a unix timestamp, which is always GMT when being parsed, from taking on
the local timezones DST flag.
 2012-09-30 04:31:29 +00:00
Derick Rethans
b004a04f0a Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 2012-10-04 08:39:34 +01:00
Derick Rethans
61bee020e1 Merge branch 'master' of git.php.net:/php-src 2012-10-04 08:38:56 +01:00
Stanislav Malyshev
e3e3fba66d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour) Prevent a unix timestamp, which is always GMT when being parsed, from taking on the local timezones DST flag.
 2012-09-30 20:21:11 -07:00
Derick Rethans
7101e9161c Merge branch 'PHP-5.4' 2012-09-14 09:38:36 +01:00
Derick Rethans
ab62ffa0a2 Merge branch 'PHP-5.3' into PHP-5.4 2012-09-14 09:38:32 +01:00
Derick Rethans
78354f30d9 - Updated to version 2012.6 (2012f) 2012-09-14 09:38:31 +01:00
Xinchen Hui
94582f9398 year++ 
missed the .re files in 5.3
 2012-09-05 23:47:51 +08:00
Xinchen Hui
d22f18007f Merge branch 'PHP-5.4' 2012-09-05 23:44:41 +08:00
Xinchen Hui
a3d078bd8f correct PHP version & year++ 2012-09-05 23:43:59 +08:00
Xinchen Hui
63d9c1f40b Merge branch 'PHP-5.4' 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2012-09-05 23:20:42 +08:00
Xinchen Hui
9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/interbase/interbase.rc
 2012-09-05 23:11:19 +08:00
Xinchen Hui
d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Derick Rethans
00fc59e0ca Merge branch 'master' of git.php.net:/php-src 2012-08-24 10:54:48 +02:00
Derick Rethans
68ecccc60b Merge branch 'PHP-5.4' 2012-08-06 12:59:44 +01:00
Derick Rethans
de59314a60 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-06 12:59:39 +01:00
Derick Rethans
0a2833bbef - Updated to version 2012.5 (2012e) 2012-08-06 12:59:38 +01:00
Dmitri Iouchtchenko
a6a7787cf2 Fix #61642: modify("+5 weekdays") returns Sunday 
Adding a non-zero multiple of 5 weekdays to any Friday, Saturday, or
Sunday would result in a Sunday instead of the correct date. This patch
provides an implementation of do_adjust_special_weekday() which does
not suffer from this issue.
 2012-08-05 19:22:36 -07:00
Derick Rethans
7e2442038c Merge branch 'PHP-5.4' 2012-07-20 10:07:33 +01:00
Derick Rethans
ceee821d73 Merge branch 'PHP-5.3' into PHP-5.4 2012-07-20 10:07:24 +01:00
Derick Rethans
d621a91a50 - Updated to version 2012.4 (2012d) 2012-07-20 10:07:23 +01:00
Derick Rethans
cecc37b467 Merge branch 'PHP-5.4' 2012-04-02 10:40:03 +01:00
Derick Rethans
6c6bec5760 Merge branch 'PHP-5.3' into PHP-5.4 2012-04-02 10:40:02 +01:00
Derick Rethans
0e53ac49e6 - Updated to version 2012.3 (2012c) 2012-04-02 10:40:01 +01:00
Derick Rethans
282d601338 - Updated to version 2012.2 (2012b) 2012-03-02 17:00:33 +00:00
Derick Rethans
55166a0684 - Updated to version 2012.2 (2012b) 2012-03-02 17:00:33 +00:00
Derick Rethans
cab11b7418 - Updated to version 2012.2 (2012b) 2012-03-02 17:00:33 +00:00
Derick Rethans
c932ada103 - Updated to version 2012.1 (2012a) 2012-03-01 15:09:49 +00:00
Derick Rethans
1476b02ca1 - Updated to version 2012.1 (2012a) 2012-03-01 15:09:49 +00:00
Derick Rethans
f851caa6d6 - Updated to version 2012.1 (2012a) 2012-03-01 15:09:49 +00:00
Pierre Joye
361c162058 - fix warning and fix buggy behavior of timelib_diff due to bad assumption of floor signature (fixes almost date_diff tests too) 2011-12-07 08:39:43 +00:00
Pierre Joye
93af22bbb9 - fix warning and fix buggy behavior of timelib_diff due to bad assumption of floor signature (fixes almost date_diff tests too) 2011-12-07 08:39:43 +00:00
Pierre Joye
ef763c0184 - fix warning and fix buggy behavior of timelib_diff due to bad assumption of floor signature (fixes almost date_diff tests too) 2011-12-07 08:39:43 +00:00
Derick Rethans
4c9fad8b36 - Fixed bug #53502 (strtotime with timezone memory leak). 
- Fixed bug #52062 (large timestamps with DateTime::getTimestamp and
  DateTime::setTimestamp).
- Fixed bug #51994 (date_parse_from_format is parsing invalid date using 'yz'
  format).
- Fixed bug #51223 (Seg fault while creating (by unserialization)
  DatePeriod).
 2011-12-06 06:21:08 +00:00
Derick Rethans
ac631dd580 - Fixed bug #53502 (strtotime with timezone memory leak). 
- Fixed bug #52062 (large timestamps with DateTime::getTimestamp and
  DateTime::setTimestamp).
- Fixed bug #51994 (date_parse_from_format is parsing invalid date using 'yz'
  format).
- Fixed bug #51223 (Seg fault while creating (by unserialization)
  DatePeriod).
 2011-12-06 06:21:08 +00:00
Derick Rethans
5b2ce47f2e - Fixed bug #53502 (strtotime with timezone memory leak). 
- Fixed bug #52062 (large timestamps with DateTime::getTimestamp and
  DateTime::setTimestamp).
- Fixed bug #51994 (date_parse_from_format is parsing invalid date using 'yz'
  format).
- Fixed bug #51223 (Seg fault while creating (by unserialization)
  DatePeriod).
 2011-12-06 06:21:08 +00:00
Derick Rethans
b2b7d5b943 - Fixed bug #52062: large timestamps with DateTime::getTimestamp and DateTime::setTimestamp. 2011-12-06 06:04:24 +00:00
Derick Rethans
8889fcacc2 - Fixed bug #52062: large timestamps with DateTime::getTimestamp and DateTime::setTimestamp. 2011-12-06 06:04:24 +00:00
Derick Rethans
2679ccc50b - Fixed bug #52062: large timestamps with DateTime::getTimestamp and DateTime::setTimestamp. 2011-12-06 06:04:24 +00:00
Derick Rethans
92e9a0bd91 - Fixed bug #54851 (DateTime::createFromFormat() doesn't interpret "D"). 2011-11-26 16:44:21 +00:00
Derick Rethans
547e240906 - Fixed bug #54851 (DateTime::createFromFormat() doesn't interpret "D"). 2011-11-26 16:44:21 +00:00
Derick Rethans
dc6ecd21ee - Fixed bug #54851 (DateTime::createFromFormat() doesn't interpret "D"). 2011-11-26 16:44:21 +00:00
Derick Rethans
1324d5d9c5 - Fixed bug #54596 (incorrect years for DateTime objects created with 4-digit 
years).
 2011-11-25 15:51:37 +00:00
Derick Rethans
81058b5e79 - Fixed bug #54596 (incorrect years for DateTime objects created with 4-digit 
years).
 2011-11-25 15:51:37 +00:00
Derick Rethans
c2ede9a00a - Fixed bug #54596 (incorrect years for DateTime objects created with 4-digit 
years).
 2011-11-25 15:51:37 +00:00
Derick Rethans
7411ae09f5 - Fixed bug #60236 (TLA timezone dates are not converted properly from 
timestamp).
- Fixed bug #55253 (DateTime::add() and sub() result -1 hour on objects with
  time zone type 2).

And fixed some test cases.
 2011-11-24 17:13:47 +00:00
Derick Rethans
a02ca5c881 - Fixed bug #60236 (TLA timezone dates are not converted properly from 
timestamp).
- Fixed bug #55253 (DateTime::add() and sub() result -1 hour on objects with
  time zone type 2).

And fixed some test cases.
 2011-11-24 17:13:47 +00:00
Derick Rethans
d0a898d2a2 - Fixed bug #60236 (TLA timezone dates are not converted properly from 
timestamp).
- Fixed bug #55253 (DateTime::add() and sub() result -1 hour on objects with
  time zone type 2).

And fixed some test cases.
 2011-11-24 17:13:47 +00:00
Derick Rethans
e3269e029e - Updated to version 2011.14 (2011n) 2011-11-02 10:58:51 +00:00
Derick Rethans
c1d520d19d - Updated to version 2011.14 (2011n) 2011-11-02 10:58:51 +00:00
Derick Rethans
c6fbe8e69d - Updated to version 2011.14 (2011n) 2011-11-02 10:58:51 +00:00
Derick Rethans
117b150360 - Updated to version 2011.13 (2011m) 2011-10-24 15:19:08 +00:00
Derick Rethans
d74a8a6e3f - Updated to version 2011.13 (2011m) 2011-10-24 15:19:08 +00:00
Derick Rethans
6671223afa - Updated to version 2011.13 (2011m) 2011-10-24 15:19:08 +00:00