From: Joe Watkins <krakjoe@php.net>
Date: Fri, 6 Jan 2017 16:07:12 +0000 (+0000)
Subject: Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
X-Git-Tag: php-7.1.2RC1~149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91cf3269c2ce384f79dde8b01e926b2cb9d98735;p=php

Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:/php-src:
  Fix #70103: Fix bug 70103 when ZTS is enabled
---

91cf3269c2ce384f79dde8b01e926b2cb9d98735