]> granicus.if.org Git - php/commitdiff
Merge branch 'sec54' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Thu, 29 Mar 2012 04:16:04 +0000 (21:16 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 29 Mar 2012 04:16:04 +0000 (21:16 -0700)
* sec54:
  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


Trivial merge