From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 29 Apr 2016 11:45:29 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.1.0alpha1~235^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbdc37ac4f440abade6f9560f093b9f8ef89db05;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Implement #51879 stream context socket option tcp_nodelay
---

dbdc37ac4f440abade6f9560f093b9f8ef89db05