From: Stanislav Malyshev Date: Wed, 12 Nov 2014 00:35:41 +0000 (-0800) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~130^2~20^2~14 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0326471a0a400829949f2e400627db84346ecf31;p=php Merge branch 'PHP-5.6' * PHP-5.6: fix loop - size_t is unsigned so can not be negative fix copypaste error Conflicts: ext/standard/html.c --- 0326471a0a400829949f2e400627db84346ecf31