From: Adam Harvey <aharvey@php.net>
Date: Fri, 9 Nov 2012 09:27:05 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.6.0alpha1~711
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=509f3fe22140bfe366a3ab4bb534ae8061a05974;p=php

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

* 'master' of git.php.net:php-src:
  This will be PHP 5.3.20
  fix NEWS
  Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)
  News entry for png memleak fix
  News entry for png memleak fix
  These need to be volatile in order to prevent leaking after the longjmp in the error handler
  These need to be volatile in order to prevent leaking after the longjmp in the error handler
---

509f3fe22140bfe366a3ab4bb534ae8061a05974