From: Christopher Jones <sixd@php.net>
Date: Fri, 30 Mar 2012 00:42:40 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
X-Git-Tag: php-5.4.4RC1~170^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06235747b17b3f5709604c8d6f12770905a28fcc;p=php

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

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fixed bug61115-1.phpt for debug build version.
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
  Fixed bug #60718 Complie problem with libpq (PostgreSQL 7.3 or less)
  This will be PHP 5.3.12
  ext/pcntl/pcntl.c: Fix typo in comment
  Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
  Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
  ext/pcntl/pcntl.c: Fix typo in comment
  ext/pcntl/pcntl.c: Fix typo in comment
  - fix bug #61541, Segfault when using ob_* in output_callback
  - fix bug #61541, Segfault when using ob_* in output_callback
  update NEWS
  fix bug #61367 - open_basedir bypass using libxml RSHUTDOWN
  open_basedir check for linkinfo
  NEWS entry for readline fix
  NEWS entry for readline fix
  Add open_basedir checks to readline_write_history and readline_read_history
---

06235747b17b3f5709604c8d6f12770905a28fcc