From: Christopher Jones <sixd@php.net>
Date: Thu, 25 Jul 2013 15:53:29 +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.2RC1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42e8f3ca288cd40ffb72a5d37d13754263348dd7;p=php

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

# By Johannes Schlüter (3) and others
# Via Xinchen Hui (3) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Upper section name
  Update NEWs
  Fixed bug #65328 (Segfault when getting SplStack object Value)
  Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
  fix missing include
  Fix bug 65299
  Fix compiler warning on redefined constant
  Fix comment
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
---

42e8f3ca288cd40ffb72a5d37d13754263348dd7