]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 261e32f e383d4d)
Merge branch 'master' of git.php.net:php-src
authorAdam Harvey <aharvey@php.net>
Fri, 9 Nov 2012 09:27:05 +0000 (17:27 +0800)
committerAdam Harvey <aharvey@php.net>
Fri, 9 Nov 2012 09:27:05 +0000 (17:27 +0800)
* '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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.