From: Christopher Jones <sixd@php.net>
Date: Mon, 1 Jul 2013 20:46:01 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~384^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a331856dfa5501a0ffa8222cfe35ae410a32985;p=php

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

# By Yasuo Ohgaki (5) and others
# Via Stanislav Malyshev (5) and others
* 'master' of https://git.php.net/repository/php-src:
  added test code for #65045.
  fixed #65045: mb_convert_encoding breaks well-formed character.
  Don't try to clean up generator stack on unclean shutdown
  NEWS
  Added PHP_FCGI_BACKLOG, overrides the default listen backlog
  Merge branch 'PHP-5.5' into master
  Fixed bug #49175: mod_files.sh does not support hash bits
  Fixed bug #35703: when session_name("123") consist only digits, should warning
  Fixed bug #49175: mod_files.sh does not support hash bits
  Fixed bug #49175: mod_files.sh does not support hash bits
  add fix for  #60560 into upgrading
  Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
  Update NEWS
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing
---

7a331856dfa5501a0ffa8222cfe35ae410a32985