Disallow separation in a number of callbacks

All of these clearly do not need separation support.

6 files changed, 10 insertions, 12 deletions

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 0c416774f2..6f5a79c42f 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1385,7 +1385,7 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
 			fci.retval = &retval;
 			fci.param_count = 2;
 			fci.params = argv;
-			fci.no_separation = 0;
+			fci.no_separation = 1;
 
 			ch->in_callback = 1;
 			error = zend_call_function(&fci, &t->fci_cache);
@@ -1432,7 +1432,7 @@ static int curl_fnmatch(void *ctx, const char *pattern, const char *string)
 			fci.retval = &retval;
 			fci.param_count = 3;
 			fci.params = argv;
-			fci.no_separation = 0;
+			fci.no_separation = 1;
 
 			ch->in_callback = 1;
 			error = zend_call_function(&fci, &t->fci_cache);
@@ -1485,7 +1485,7 @@ static size_t curl_progress(void *clientp, double dltotal, double dlnow, double
 			fci.retval = &retval;
 			fci.param_count = 5;
 			fci.params = argv;
-			fci.no_separation = 0;
+			fci.no_separation = 1;
 
 			ch->in_callback = 1;
 			error = zend_call_function(&fci, &t->fci_cache);
@@ -1541,7 +1541,7 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
 			fci.retval = &retval;
 			fci.param_count = 3;
 			fci.params = argv;
-			fci.no_separation = 0;
+			fci.no_separation = 1;
 
 			ch->in_callback = 1;
 			error = zend_call_function(&fci, &t->fci_cache);
@@ -1603,7 +1603,7 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
 			fci.retval = &retval;
 			fci.param_count = 2;
 			fci.params = argv;
-			fci.no_separation = 0;
+			fci.no_separation = 1;
 
 			ch->in_callback = 1;
 			error = zend_call_function(&fci, &t->fci_cache);
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 7c63c33e86..83a0581ce4 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -151,7 +151,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs,
 
 	fci.object = NULL;
 	fci.retval = &retval;
-	fci.no_separation = 0;
+	fci.no_separation = 1;
 
 	if (!zend_make_callable(&fci.function_name, &callable)) {
 		php_error_docref(NULL, E_WARNING, "Unable to call handler %s()", ZSTR_VAL(callable));
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 122373dea3..7aaaf3f695 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -1529,7 +1529,7 @@ static zend_string *preg_do_repl_func(zend_fcall_info *fci, zend_fcall_info_cach
 	fci->retval = &retval;
 	fci->param_count = 1;
 	fci->params = &arg;
-	fci->no_separation = 0;
+	fci->no_separation = 1;
 
 	if (zend_call_function(fci, fcc) == SUCCESS && Z_TYPE(retval) != IS_UNDEF) {
 		if (EXPECTED(Z_TYPE(retval) == IS_STRING)) {
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index acb191c665..58696c01bb 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -2146,7 +2146,7 @@ static int php_sqlite3_authorizer(void *autharg, int action, const char *arg1, c
 	fci->retval = &retval;
 	fci->param_count = 5;
 	fci->params = argv;
-	fci->no_separation = 0;
+	fci->no_separation = 1;
 
 	int authreturn = SQLITE_DENY;
 
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index f3c877b87e..60bdfb4261 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -464,8 +464,7 @@ static void xml_call_handler(xml_parser *parser, zval *handler, zend_function *f
 		fci.retval = retval;
 		fci.param_count = argc;
 		fci.params = argv;
-		fci.no_separation = 0;
-		/*fci.function_handler_cache = &function_ptr;*/
+		fci.no_separation = 1;
 
 		result = zend_call_function(&fci, NULL);
 		if (result == FAILURE) {
diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c
index 882adc1ee6..b63814e236 100644
--- a/ext/xsl/xsltprocessor.c
+++ b/ext/xsl/xsltprocessor.c
@@ -245,8 +245,7 @@ static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int t
 	ZVAL_COPY_VALUE(&fci.function_name, &handler);
 	fci.object = NULL;
 	fci.retval = &retval;
-	fci.no_separation = 0;
-	/*fci.function_handler_cache = &function_ptr;*/
+	fci.no_separation = 1;
 	if (!zend_make_callable(&handler, &callable)) {
 		if (!EG(exception)) {
 			php_error_docref(NULL, E_WARNING, "Unable to call handler %s()", ZSTR_VAL(callable));