From: Jerome Loyet <fat@php.net>
Date: Thu, 27 Sep 2012 22:06:13 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.5.0alpha1~45^2~4^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca6273240eecc848ee3f4909e5a9fa10b2b8292e;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (641 commits)
  fix unix/win dir separators
  Fix bug #63173: Crash when invoking invalid array callback
  compile out example plugin in a release build
  change public key setting to PERDIR and finish code that allows to set the key file programatically per mysqli_options()
  remove old unicode code, that is was compiled out by using a macro
  Add SHA256 authentication support - password hashing to mysqlnd Automatic switchover to SSL with plain-text password is not part of this
  Correct the test summary
  Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
  Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
  Add NEWS/UPGRADING for previous change
  Simplify set_error_handler/set_exception_handler code
  Return previous error handler when resetting the error handler
  Allow resetting the error handler
  Revert error/exception handler changes
  Fixed bug #63132
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
  Add CURLOPT_READDATA which was removed by mistake
  Fixing NEWS file
  Fixed bug #63111 (is_callable() lies for abstract static method)
  updated lib versions
  ...
---

ca6273240eecc848ee3f4909e5a9fa10b2b8292e