]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f39a236 e6a9d1c)
Merge branch 'PHP-5.4' into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Sat, 23 Mar 2013 09:21:22 +0000 (10:21 +0100)
committerPierre Joye <pierre.php@gmail.com>
Sat, 23 Mar 2013 09:21:22 +0000 (10:21 +0100)
* PHP-5.4:
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too

1  2 
sapi/cli/php_cli_server.c patch | diff1 | diff2 | blob | history

diff --cc sapi/cli/php_cli_server.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.