From: Christopher Jones <sixd@php.net>
Date: Tue, 30 Jul 2013 23:53:05 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
X-Git-Tag: php-5.5.2~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7c87fcc8c61eb8ee7b17716b7f23a335a364f78;p=php

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Dmitry Stogov (5) and Rui Hirokawa (2)
# Via Dmitry Stogov (3) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Fixed php-5.2 support
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Added support for glob symbols in blacklist entries (?, *, **)
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
  A minor fix for configure outpu (Tony)
  Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
---

f7c87fcc8c61eb8ee7b17716b7f23a335a364f78