]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c870633 3d3f11e)
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Mon, 20 Jun 2016 11:59:35 +0000 (14:59 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 20 Jun 2016 11:59:35 +0000 (14:59 +0300)
* 'master' of git.php.net:php-src:
  Fixed the UTF-8 and long path support in the streams on Windows.

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

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