From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 17 Oct 2014 04:28:40 +0000 (-0700)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_NATIVE_TLS_MERGE~104^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9d6556971a435f71eabf142d8fb814382f3b6ac;p=php

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

* 'master' of git.php.net:php-src: (1132 commits)
  Micro optimizations for isset/empty
  Micro optimization for zend_hash_next_index_insert_new()
  Fix array_keys() on $GLOBALS
  Fix procedural finfo calls in methods
  Fix allocator for 64bit zend_long with 32bit long
  Use intptr_t for zend_intptr_t typedef
  Fix format strings in zend_alloc
  Drop zend_long64 in favor of int64_t
  Removed deprecated fields
  NEWS
  cleanup NEWS
  removing the NEWS entry as we had to revert this fix for now
  Revert "Merge branch 'PHP-5.5' into PHP-5.6"
  Revert "fix TS build"
  Revert "Merge branch 'PHP-5.4' into PHP-5.5"
  Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
  Revert "Bug #41631: Fix regression from first attempt (6569db8)"
  NEWS
  Fixed Bug #65171 imagescale() fails
  Fixed bug #68234
  ...
---

a9d6556971a435f71eabf142d8fb814382f3b6ac