From: Christopher Jones <sixd@php.net>
Date: Mon, 22 Jul 2013 17:59:10 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~377
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99f7b72025282faccfa96932397b19caf6d49e00;p=php

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

# By Veres Lajos (15) and others
# Via Stanislav Malyshev (31) and others
* 'master' of https://git.php.net/repository/php-src: (99 commits)
  fixed possible null deref
  Disable a flag
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
  Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
  Added recursivetreeiterator::setPostfix() method
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix
  backward compatibility
  HASH_KEY_NON_EXISTANT fix
  Update NEWS
  Fixed bug #65304 (Use of max int in array_sum)
  Updaet NEWS
  Reorder NEWS
  intl: remove extra quotes from arginfo params
  updated test script for bug #65045.
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  ...
---

99f7b72025282faccfa96932397b19caf6d49e00