Bug #67965: Fix blocking behavior in non-blocking crypto streams
Bug #41631: Fix regression from first attempt (6569db8)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams