1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Commit Graph

122 Commits

Author SHA1 Message Date
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
David Soria Parra b86c85723e Fix #64711 ("value computed but not used" in parse_date.c) 2013-04-26 11:33:54 +02: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
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
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
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
Xinchen Hui a3d078bd8f correct PHP version & year++ 2012-09-05 23:43:59 +08: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 dc6ecd21ee - Fixed bug #54851 (DateTime::createFromFormat() doesn't interpret "D"). 2011-11-26 16:44:21 +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
Stanislav Malyshev bbf1904f3d fix error reporting on missing data - don't produce double errors 2011-06-19 18:55:48 +00:00
Hannes Magnusson 6f56bf1cfc Fixed bug#51819 (Case discrepancy in timezone names cause Uncaught exception and fatal error) 2011-06-05 13:30:01 +00:00
Nuno Lopes 301eda5b6d MFB (r309775): fix last commit 2011-03-28 09:11:28 +00:00
Adam Harvey e1c16f119c Fix bug #54316 (DateTime::createFromFormat does not handle trailing '|'
correctly).
2011-03-21 09:40:52 +00:00
Derick Rethans 8ece8ad314 - Added the + modifier to parseFromFormat to allow trailing text in the
string to parse without throwing an error.
#- Patch by Stas, test case by me.
2010-12-12 17:17:16 +00:00
Derick Rethans d763e535cc - Added support for the ( and ) delimiters/separators to
DateTime::createFromFormat().
#- There are a few more things to come, once ready, I'll regenerate the .c file
#  and merge.
2010-11-13 12:56:21 +00:00
Derick Rethans 1fc5e47fb6 - Fixed bug #52430 (date_parse parse 24:xx:xx as valid time). (Derick) 2010-08-30 16:40:29 +00:00
Kalle Sommer Nielsen c0f3aca5a3 Update the re2c files aswell (bug #51943) 2010-07-14 00:04:43 +00:00
Adam Harvey a2edb7f69c Fixed bug #51393 (DateTime::createFromFormat() fails if format string contains timezone). 2010-03-26 04:31:26 +00:00
Derick Rethans 3025ca8e17 - Fixed bug #46111 (Some timezone identifiers can not be parsed). 2010-03-07 19:18:06 +00:00
Derick Rethans 2d2e02740a - Fixed bug #50392 (date_create_from_format enforces 6 digits for 'u' format
character).
2010-03-07 13:08:47 +00:00
Derick Rethans 13e0d47cf3 - Fixed bug #51096 ('last day' and 'first day' are handled incorrectly when
parsing date strings).
- For 5.2 I just added the test case minus new 5.3 additions.
2010-03-06 16:04:47 +00:00
Derick Rethans 8ac4d1190a - Added a test case for bug #45866
- Fixed tests: oo_002, bug46268
- Fixed bug #50930 (Wrong date by php_date.c patch with ancient gcc/glibc
  versions).
- Make sure faulty strings passed to DateTime::modify() notify the user.
- Revert fix for bug #50392 as it was fixed wrongly without a proper test case.
- Fixed a bug with the 'r' formatting function as the default buffer size that
  was allocated only fit 4 digit years.
2010-02-10 16:23:30 +00:00
Ilia Alshanetsky 1ee6c8277f Fixed bug #50680 (strtotime() does not support eighth ordinal number). 2010-01-07 12:54:44 +00:00
Ilia Alshanetsky d0f6848e66 Fixed bu #50392 (date_create_from_format() enforces 6 digits for 'u' format character) 2009-12-15 12:34:12 +00:00
Derick Rethans 24b973cafc - Fixed bug #45554 (Inconsistent behavior of the u format char). 2009-07-29 15:34:59 +00:00
Derick Rethans aea378c91c - MFH: Fixed bug #46889: Memory leak in strtotime(). 2008-12-18 14:55:36 +00:00
Derick Rethans 1c08ae1c8e - MFH: Fixed an issue with the * format specifier for parsing from a
user-defined format.
2008-11-05 10:42:42 +00:00
Derick Rethans e3cd394979 - MFH: Support for "back of <hour>" and "front of <hour>" phrases that are used
in Scotland.
2008-08-29 12:01:57 +00:00
Derick Rethans b5e2564abf - MFH: Fixed a bug with the YYYY-MM format not resetting the day correctly.
- MFH: Fixed a bug in the DateTime->modify() methods, it would not use the
  advanced relative time strings.
- MFH: Fixed return values of all the modifying methods, they now properly
  return the object itself.
2008-07-30 18:00:44 +00:00
Derick Rethans 07c9bd8382 - MFH: Fixed an issue with "first <weekday> of" in case the first <weekday> was
the same day-of-week as the first day of the month.
2008-07-23 19:53:39 +00:00
Derick Rethans 11f9cd84f7 - MFH: Fixed bug #43452 (strings containing a weekday, or a number plus weekday
behaved incorrect of the current day-of-week was the same as the one in the
  phrase).
2008-07-23 18:50:37 +00:00
Derick Rethans 0ab7520dc0 - MFH: Fixed bug #45529 (new DateTimeZone() and date_create()->getTimezone() behave
different).
2008-07-16 15:41:01 +00:00
Derick Rethans 3df7836db9 - MFH: Also add the warnings for times. This does not make sense for the
english text parser, as invalid times are never allowed in there.
2008-07-15 17:38:27 +00:00
Derick Rethans c76ba173a9 - MFH: Added a warning to the error struct in case a parsed-date was found to
be invalid.
2008-07-14 17:36:12 +00:00
Derick Rethans 5ab9ca968b - MFH: Fixed a compiler warning - the code didn't make much sense. 2008-07-11 08:42:54 +00:00
Derick Rethans db2ed70a73 - MFH: Fixed bug #45459 (date_create_from_format() fails on DATE_RFC3339) by
allowing a few more format specifiers in date_create_from_format() /
  date_parse_from_format().
2008-07-08 20:25:28 +00:00
Derick Rethans 4a23bbfe75 - MFH: Fixed some ambiguities in the date parser. 2008-07-08 18:28:49 +00:00
Derick Rethans 484d6b21c0 - Replaced // by /* .. */ comments. 2008-07-08 17:55:59 +00:00
Derick Rethans f533671711 - MFH: Added support for "<xth> <weekday of" and "last <weekday> of" phrases to
be used with months - like in "last saturday of februari 2008".
2008-05-04 20:52:56 +00:00
Derick Rethans 97b37f253c - MFH: Rearranged some structures to allow for more powerfull period/intervals. 2008-05-01 16:15:45 +00:00
Derick Rethans 357292a098 - MFH: Fixed "this week", "previous week"/"last week" and "next week" phrases
by actually meaning the week.
#- MFH: For now the week starts on Monday, but I plan on making that
#  configurable.
2008-04-27 19:14:33 +00:00
Ilia Alshanetsky 97e293ed4b Removed unused variable 2008-03-23 15:48:10 +00:00
Derick Rethans a27d6afd83 - Added support for parsing date/time strings returned by MS SQL with strtotime(). 2008-03-13 15:54:25 +00:00
Derick Rethans b8883b65b8 - MFH: Added a few new separation specifiers.
- MFH: Added specifiers that can reset or default the y/m/d/h/i/s/tz values.
- MFH: Fixed a problem with parsing timezones as part of a format.
2008-02-25 18:26:33 +00:00