From: Rasmus Lerdorf <rasmus@php.net>
Date: Mon, 10 Nov 2014 18:36:57 +0000 (-0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_NATIVE_TLS_MERGE~130^2~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5464e331d18241c497529ac7306e0f58fb9c47b6;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (70 commits)
  convert_to_string also does the check
  A better fix(do the convertion in compile time)
  update UPGRADING.INTERNALS
  better description for the toolset config option
  use proper declarations for zend_stat_t
  move these functions to the appropriate place
  Fixed segfault in  bug62500.phpt
  Update NEWS
  Fixed bug #68370 ("unset($this)" can make the program crash)
  move more common ldflags into function
  rename intel toolset to icc - shorter
  fix gd compilation with icc toolset
  either ms or intel linker is used, /libpath is supported
  further catch up with phpize and improved clang arch setup
  add /fallback for clang-cl
  parametrize WINVER and update its value
  further refactoring of toolset+phpize stuff
  catch up the toolset changes with phpize
  fix linking for clang, using linker directly
  adjust pid_t declaration so it doesn't conflict with apache one
  ...
---

5464e331d18241c497529ac7306e0f58fb9c47b6