oops, 5.4 and 5.5 use malloc in TSRM
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  oops, 5.4 and 5.5 use malloc in TSRM