Merge branch 'true-async-api' into true-async

# Conflicts:
#	configure.ac

Author: EdmondDantes

configure.ac

@@ -1051,16 +1051,16 @@ PHP_ARG_ENABLE([undefined-sanitizer],,
     [Enable undefined sanitizer])],
   [no],
   [no])
-PHP_ARG_ENABLE([experimental-async-api],,
-  [AS_HELP_STRING([--enable-experimental-async-api],
-    [Enable experimental async API support])],
-  [no],
+PHP_ARG_ENABLE([async-api],,
+  [AS_HELP_STRING([--disable-async-api],
+    [Disable async API support])],
+  [yes],
   [no])
 
-if test "$PHP_EXPERIMENTAL_ASYNC_API" = "yes"; then
-  AC_DEFINE([PHP_ASYNC_API], 1, [Enable async API support])
-  PHP_ASYNC_API="yes"
-fi
+AS_VAR_IF([PHP_ASYNC_API], [yes], [
+  AC_DEFINE([PHP_ASYNC_API], [1], [Define to 1 if async API support is enabled.])
+])
+
 
 dnl Extension configuration.
 dnl ----------------------------------------------------------------------------
@@ -1806,7 +1806,7 @@ PHP_ADD_SOURCES([Zend], m4_normalize([
   ]),
   [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $fiber_asm_cflag])
 
-if test "$PHP_EXPERIMENTAL_ASYNC_API" = "yes"; then
+if test "$PHP_ASYNC_API" = "yes"; then
   PHP_ADD_SOURCES([Zend], m4_normalize([zend_async_API.c]),
     [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $fiber_asm_cflag])
 fi

win32/build/config.w32

@@ -408,10 +408,9 @@ ARG_ENABLE('snapshot-build', 'Build a snapshot: turns on everything it can and i
 
 ARG_ENABLE('vs-link-compat', 'Allow linking of libraries built with compatible versions of VS toolset', 'yes');
 
-ARG_ENABLE("experimental-async-api", "Enable experimental async API support", "no");
+ARG_ENABLE("async-api", "Disable async API support", "yes");
 
-if (PHP_EXPERIMENTAL_ASYNC_API == "yes") {
-    AC_DEFINE('PHP_ASYNC_API', 1, 'Enable experimental async API support');
+if (PHP_ASYNC_API == "yes") {
     ADD_SOURCES("Zend", "zend_async_API.c");
     ADD_SOURCES("main", "network_async.c");
 }