From: Christopher Jones <sixd@php.net>
Date: Fri, 13 Sep 2013 21:10:58 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHPNG_MERGE~222^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e03a3d55d817aed64c025e49b4472ac2e8904cfe;p=php

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

# By Nikita Popov (10) and others
# Via Nikita Popov (6) and others
* 'master' of https://git.php.net/repository/php-src: (26 commits)
  Remove some more unnecessary macros from phar
  Remove PHAR_(Z)STR* usages
  Remove version checks in phar
  Fix two warnings
  Provide more macros for handling of interned strings
  Make use of Z_*VAL and ZVAL_* in language scanner
  Make consistent use of Z_*VAL macros in compiler
  fix broken sha2 configure tests
  fix broken sha2 configure tests
  Small cleanup in class name resolution of compiler
  Fixed minor bug in test.
  Move NEWS entries to correct version
  Fix bug #64782: SplFileObject constructor make $context optional
  Prepare pdo_firebird for a pecl release also
  Fix bug #65502: DateTimeImmutable::createFromFormat returns DateTime
  Fix bug #65548: Comparison for DateTimeImmutable doesn't work
  Sort the NEWS file alphabetically.
  Request non-keep-alive connections by default in HTTP 1.1 requests.
  Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.
  Tinker with the wording of the short_open_tag description.
  ...
---

e03a3d55d817aed64c025e49b4472ac2e8904cfe