From: Xinchen Hui <laruence@php.net>
Date: Sun, 15 Feb 2015 14:56:56 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc087ed1eebb2eaa4be88ab16803641908348e4c;p=php

Merge branch 'PHP-5.6'

Conflicts:
	ext/readline/readline.c
---

fc087ed1eebb2eaa4be88ab16803641908348e4c
diff --cc ext/readline/readline.c
index 3b72e9ee09,8cf7734b62..84b5bd3d66
--- a/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;
  	}