Merge branch 'PHP-5.6'

Conflicts:
	ext/readline/readline.c

diff --cc ext/readline/readline.c
index 3b72e9ee0987f25242b6388a95843963dad866d9,8cf7734b62090c7c71daf5fe14d4df11e5fb07fc..84b5bd3d660612fe2a31c90ca4ffd90f7f3eb522
--- 1/ext/readline/readline.c
--- 2/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@@ -402,7 -400,7 +402,7 @@@ PHP_FUNCTION(readline_read_history
                return;
        }
  
-       if (php_check_open_basedir(arg)) {
 -      if (arg && php_check_open_basedir(arg TSRMLS_CC)) {
++      if (arg && php_check_open_basedir(arg)) {
                RETURN_FALSE;
        }
  
@@@ -426,7 -425,7 +427,7 @@@ PHP_FUNCTION(readline_write_history
                return;
        }
  
-       if (php_check_open_basedir(arg)) {
 -      if (arg && php_check_open_basedir(arg TSRMLS_CC)) {
++      if (arg && php_check_open_basedir(arg)) {
                RETURN_FALSE;
        }