Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64…
…_56_backport * origin/PHP-5.6: (24 commits) drop exec perm on doc files fix test for 5.4/5.5 add test for previous fix NEWS NEWS NEWS Fix regression introduce in fix for bug #67118 update news update NEWS Fix tests Fix possible segfault depending on memory location... fix gcov data with some locales (again) fix gcov data with some locales (again) Update NEWS Fixed startup segfault in non-debug builds Fixes issue #87 Fixed regression introduced by patch for bug #67072 Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files (re)add cve number in NEWS, from 5.4.29 NEWS NEWS ... Conflicts: ext/date/php_date.c
- Loading branch information
Showing
16 changed files
with
194 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
--TEST-- | ||
Regression introduce in fix for Bug #67118 | ||
--INI-- | ||
date.timezone=Europe/Paris | ||
--FILE-- | ||
<?php | ||
class Foo extends DateTime { | ||
public function __construct($time = null) { | ||
$tz = new DateTimeZone('UTC'); | ||
try { | ||
echo "First try\n"; | ||
parent::__construct($time, $tz); | ||
return; | ||
} catch (Exception $e) { | ||
echo "Second try\n"; | ||
parent::__construct($time.'C', $tz); | ||
} | ||
} | ||
} | ||
$date = '12 Sep 2007 15:49:12 UT'; | ||
var_dump(new Foo($date)); | ||
?> | ||
Done | ||
--EXPECTF-- | ||
First try | ||
Second try | ||
object(Foo)#1 (3) { | ||
["date"]=> | ||
string(%d) "2007-09-12 15:49:%s" | ||
["timezone_type"]=> | ||
int(3) | ||
["timezone"]=> | ||
string(3) "UTC" | ||
} | ||
Done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.