Bug #41631: Observe socket read timeouts in SSL streams
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #41631: Observe socket read timeouts in SSL streams
Merge branch 'PHP-5.5' into PHP-5.6

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

Conflicts:
	ext/openssl/xp_ssl.c