From: Anatol Belski Date: Fri, 12 Sep 2014 12:37:54 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_NATIVE_TLS_MERGE~150^2~17^2~3 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69d6e093e91f5c166d5db983fe4efba8fe864f03;p=php Merge branch 'PHP-5.6' * PHP-5.6: fixed the cast and incompatible pointer warning Conflicts: sapi/cgi/fastcgi.c --- 69d6e093e91f5c166d5db983fe4efba8fe864f03