From: Boris Lytochkin <lytboris@php.net>
Date: Sat, 15 Jun 2013 20:03:30 +0000 (+0400)
Subject: Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
X-Git-Tag: php-5.4.17RC1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8acfa0b3f8e10780c1f1a3f07c2b8466c289b9bb;p=php

Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/push/php-src: (76 commits)
  Fixed bug #63186 (compile failure on netbsd)
  fix test for bug #60322
  ensure the error_reporting level to get expected notice
  fixed tests
  missing tests for bug #53437
  fix double entry
  Merge branch 'pull-request/341'
  typo fixes (argument)
  typo fixes (accommodate, parameter)
  missing colon
  Backported the fix for bug #53437
  Backported the fix for bug #53437
  Fixed bug #64988 (Class loading order affects E_STRICT warning)
  Fixed test script
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
  Fix spelling and correct typo.
  Callback has to be restored in MSHUTDOWN
  Update NEWs
  Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
  Fixed merge wrongly
  ...
---

8acfa0b3f8e10780c1f1a3f07c2b8466c289b9bb