]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2578d08 3aaf90d)
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Fri, 29 Apr 2016 11:45:29 +0000 (14:45 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 29 Apr 2016 11:45:29 +0000 (14:45 +0300)
* 'master' of git.php.net:php-src:
  Implement #51879 stream context socket option tcp_nodelay


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.