From: Pierre Joye <pierre.php@gmail.com>
Date: Tue, 13 May 2014 04:51:45 +0000 (+0200)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~380
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc0161b72063f79bd80af3cfefe28a4f20115610;p=php

Merge branch 'phpng' of git.php.net:php-src into phpng

# By Dmitry Stogov (5) and others
# Via Xinchen Hui (3) and Dmitry Stogov (1)
* 'phpng' of git.php.net:php-src:
  restore unexpected commit
  Convert to unpacked before deleting elements
  - Fixed ZTS build
  Fix memory error in spl_directory.c
  Fix spl_directory cast_object, reenable error
  Support for ext/phar (all tests passed)
  ext/phar support (incomplete)
  Fixed double free (xmlrpc is done, 1 test failed due to knew issue)
  Fixed typo
  Refactoring ext/xmlrpc (incompleted)
  Removed error message that breaks phar
  ext/phar support (incomplete)
  Refactor ext/gd (all tests passes)
  Fixed wrong buffer length (added place for terminating zero)
---

bc0161b72063f79bd80af3cfefe28a4f20115610