From: Rob Richards <rrichards@php.net>
Date: Sat, 6 Jul 2013 12:00:58 +0000 (-0400)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~17^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eed492ce847c5de575a3aacac63a01f63d00ea88;p=php

Merge branch 'PHP-5.4' into PHP-5.5

# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.4:
  truncate results at depth of 255 to prevent corruption
  fix assembly of safe_address() for x86 and x86_64
  fix assembly of safe_address() for x86 and x86_64
---

eed492ce847c5de575a3aacac63a01f63d00ea88