diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-18 19:49:36 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-18 19:49:36 -0700 |
| commit | c2b8a726737e0046eb72be535fdb4fb8dca57f3b (patch) | |
| tree | 346f8b0ce00a53ab2f52c132d2e081f38efa6a56 /ext/date/lib/parse_date.c | |
| parent | e06a712c900d05895dd9d03c9ff5caa708fc30e7 (diff) | |
| parent | 94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf (diff) | |
| download | php-git-c2b8a726737e0046eb72be535fdb4fb8dca57f3b.tar.gz | |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By David Soria Parra (6) and others
# Via David Soria Parra (5) and Michael Wallner (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Revert "EmptyIterator now implements Countable; fixes bug 60577"
RFC 6598 reserved ip range starts at 100.64.0.0
fix a very rare case of use of uninitialized value combined with a memleak
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
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
Diffstat (limited to 'ext/date/lib/parse_date.c')
| -rw-r--r-- | ext/date/lib/parse_date.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c index 9428ce3804..0e99e231d6 100644 --- a/ext/date/lib/parse_date.c +++ b/ext/date/lib/parse_date.c @@ -25002,7 +25002,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim TIMELIB_CHECK_NUMBER; sec = timelib_get_nr_ex((char **) &ptr, 2, &length); if (sec == TIMELIB_UNSET || length != 2) { - add_pbf_error(s, "A two second minute could not be found", string, begin); + add_pbf_error(s, "A two digit second could not be found", string, begin); } else { s->time->s = sec; } |