From: Daniel Lowrey <rdlowrey@php.net>
Date: Thu, 7 Aug 2014 16:17:29 +0000 (-0400)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=217c8edd006db9acc9e30c5ed422d8d838cce2e4;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #41631: Observe socket read timeouts in SSL streams
---

217c8edd006db9acc9e30c5ed422d8d838cce2e4