From: Anatol Belski <ab@php.net>
Date: Sat, 6 Dec 2014 20:37:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into native-tls
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba35b22bc4a7af791ff2ab7c2ca8e9f4aa6d64df;p=php

Merge remote-tracking branch 'origin/master' into native-tls

* origin/master: (35 commits)
  Fixed bug #68398 msooxml matches too many archives
  Fix zpp call in apache_getenv()
  Drop unnecessary zval containers
  fixed test
  C89 compat
  add include for missing localeconv_r proto
  updated NEWS
  Fixed bug #65230 setting locale randomly broken
  Fix compilation error (ref #68424)
  Removed useless handlers
  Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers.
  Revert unintentional docblock change
  Restored zip/oci8 PHP 4 code, add PHP 7 checks
  Note macro removal in UPGRADING.INTERNALS
  Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)
  Zend Engine 3
  Updated NEWS
  Updated NEWS
  Updated NEWS
  Start adding new attribute to control multi statements
  ...
---

ba35b22bc4a7af791ff2ab7c2ca8e9f4aa6d64df