From: ULF WENDEL <uw@php.net>
Date: Mon, 22 Oct 2012 11:38:02 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
X-Git-Tag: php-5.4.9RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77fd708a0b81bf6dfcfce6aba24eaa606b97f630;p=php

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

* 'PHP-5.4' of git.php.net:php-src: (22 commits)
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
  update NEWS
  updated NEWS
  Fixed bug #63284 PCRE upgrade to 8.31
  preg indenpent test script for #63055
  Update libmagic.patch
  Add fix & missing fix
  Add fix & missing fix
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  I forgot that inconsistent is only avaliable in debug mode
  Add comments
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  ...
---

77fd708a0b81bf6dfcfce6aba24eaa606b97f630