Merge branch 'true-async' into true-async-stable

Author: EdmondDantes

Zend/zend_async_API.h

@@ -561,15 +561,15 @@ static zend_always_inline void
 zend_async_callbacks_push(zend_async_event_t *event, zend_async_event_callback_t *callback)
 {
 	if (event->callbacks.data == NULL) {
-		event->callbacks.data = safe_emalloc(4, sizeof(zend_async_event_callback_t *), 0);
+		event->callbacks.data = (zend_async_event_callback_t **)safe_emalloc(4, sizeof(zend_async_event_callback_t *), 0);
 		event->callbacks.capacity = 4;
 	}
 
 	zend_async_callbacks_vector_t *vector = &event->callbacks;
 
 	if (vector->length == vector->capacity) {
 		vector->capacity = vector->capacity ? vector->capacity * 2 : 4;
-		vector->data = safe_erealloc(vector->data,
+		vector->data = (zend_async_event_callback_t **)safe_erealloc(vector->data,
 									 vector->capacity,
 									 sizeof(zend_async_event_callback_t *),
 									 0);
@@ -770,13 +770,13 @@ zend_async_scope_add_child(zend_async_scope_t *parent_scope, zend_async_scope_t
 	child_scope->parent_scope = parent_scope;
 
 	if (vector->data == NULL) {
-		vector->data = safe_emalloc(4, sizeof(zend_async_scope_t *), 0);
+		vector->data = (zend_async_scope_t **)safe_emalloc(4, sizeof(zend_async_scope_t *), 0);
 		vector->capacity = 4;
 	}
 
 	if (vector->length == vector->capacity) {
 		vector->capacity *= 2;
-		vector->data = safe_erealloc(vector->data, vector->capacity, sizeof(zend_async_scope_t *), 0);
+		vector->data = (zend_async_scope_t **)safe_erealloc(vector->data, vector->capacity, sizeof(zend_async_scope_t *), 0);
 	}
 
 	vector->data[vector->length++] = child_scope;

configure.ac

@@ -1675,7 +1675,7 @@ PHP_ADD_SOURCES([main], m4_normalize([
   ]),
   [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
 
-if test "$PHP_EXPERIMENTAL_ASYNC_API" = "yes"; then
+if test "$PHP_ASYNC_API" = "yes"; then
 PHP_ADD_SOURCES([main], m4_normalize([network_async.c]),
   [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
 fi