diff options
| author | Michaël Zasso <mic.besace@gmail.com> | 2015-10-06 08:42:38 +0200 |
|---|---|---|
| committer | Ali Ijaz Sheikh <ofrobots@google.com> | 2015-10-14 11:20:34 -0700 |
| commit | d8011d1683fe0d977de2bea1147f5213d4490c5a (patch) | |
| tree | 54967df8dc1732e59eef39e5c5b39fe99ad88977 /deps/v8/src/dateparser.cc | |
| parent | d1a2e5357ef0357cec9b516fa9ac78cc38a984aa (diff) | |
| download | android-node-v8-d8011d1683fe0d977de2bea1147f5213d4490c5a.tar.gz android-node-v8-d8011d1683fe0d977de2bea1147f5213d4490c5a.tar.bz2 android-node-v8-d8011d1683fe0d977de2bea1147f5213d4490c5a.zip | |
deps: upgrade V8 to 4.6.85.23
PR-URL: https://github.com/nodejs/node/pull/3351
Reviewed-By: indutny - Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/v8/src/dateparser.cc')
| -rw-r--r-- | deps/v8/src/dateparser.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/deps/v8/src/dateparser.cc b/deps/v8/src/dateparser.cc index 0e5cc8c3ef..09dbf1127d 100644 --- a/deps/v8/src/dateparser.cc +++ b/deps/v8/src/dateparser.cc @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "src/v8.h" - #include "src/dateparser.h" +#include "src/char-predicates-inl.h" +#include "src/objects-inl.h" + namespace v8 { namespace internal { @@ -80,7 +81,12 @@ bool DateParser::TimeComposer::Write(FixedArray* output) { } if (!IsHour(hour) || !IsMinute(minute) || - !IsSecond(second) || !IsMillisecond(millisecond)) return false; + !IsSecond(second) || !IsMillisecond(millisecond)) { + // A 24th hour is allowed if minutes, seconds, and milliseconds are 0 + if (hour != 24 || minute != 0 || second != 0 || millisecond != 0) { + return false; + } + } output->set(HOUR, Smi::FromInt(hour)); output->set(MINUTE, Smi::FromInt(minute)); |