From: Anatol Belski <ab@php.net>
Date: Fri, 24 Oct 2014 22:33:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into native-tls
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=173659d341528c4abbabcc6a214ff516f0369717;p=php

Merge remote-tracking branch 'origin/master' into native-tls

* origin/master:
  fix infinite loop
---

173659d341528c4abbabcc6a214ff516f0369717