Removal of the #ifdef PHP_ASYNC_API condition from the project.

Author: EdmondDantes

configure.ac

@@ -1660,10 +1660,8 @@ PHP_ADD_SOURCES([main], m4_normalize([
   ]),
   [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
 
-if test "$PHP_ASYNC_API" = "yes"; then
 PHP_ADD_SOURCES([main], m4_normalize([network_async.c]),
   [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
-fi
 
 if printf "#if __ELF__\nelf\n#endif\n" | $CC -E - | grep elf > /dev/null; then
   PHP_ADD_SOURCES([main], [debug_gdb_scripts.c])

ext/curl/config.m4

@@ -72,14 +72,11 @@ if test "$PHP_CURL" != "no"; then
     [AC_MSG_FAILURE([The libcurl check failed.])],
     [$CURL_LIBS])
 
-  curl_sources="interface.c multi.c share.c curl_file.c"
+  curl_sources="interface.c multi.c share.c curl_file.c curl_async.c"
 
-  if test "$PHP_ASYNC_API" = "yes"; then
-    curl_sources="$curl_sources curl_async.c"
-    PKG_CHECK_MODULES([CURL_ASYNC], [libcurl >= 7.87.0], [], [
-      AC_MSG_ERROR([libcurl >= 7.87.0 is required for TrueAsync due to curl_multi_socket_action crashes in earlier versions])
-    ])
-  fi
+  PKG_CHECK_MODULES([CURL_ASYNC], [libcurl >= 7.87.0], [], [
+    AC_MSG_ERROR([libcurl >= 7.87.0 is required for TrueAsync due to curl_multi_socket_action crashes in earlier versions])
+  ])
 
   PHP_NEW_EXTENSION([curl],
     [$curl_sources],

ext/curl/config.w32

@@ -14,10 +14,7 @@ if (PHP_CURL != "no") {
 		 CHECK_LIB("libssh2.lib", "curl", PHP_CURL) &&
 		 CHECK_LIB("nghttp2.lib", "curl", PHP_CURL))
 		) {
-        var curl_sources = "interface.c multi.c share.c curl_file.c";
-        if (typeof PHP_ASYNC_API !== "undefined" && PHP_ASYNC_API == "yes") {
-            curl_sources += " curl_async.c";
-        }
+        var curl_sources = "interface.c multi.c share.c curl_file.c curl_async.c";
         EXTENSION("curl", curl_sources);
 		AC_DEFINE('HAVE_CURL', 1, "Define to 1 if the PHP extension 'curl' is available.");
 		ADD_FLAG("CFLAGS_CURL", "/D PHP_CURL_EXPORTS=1");

ext/curl/curl_private.h

@@ -132,11 +132,9 @@ typedef struct {
 	struct {
 		int no;
 	} err;
-#ifdef PHP_ASYNC_API
 	// A pointer to an event that can be triggered when the Multi CURL finishes waiting for all handlers.
 	// This is used to wake up the coroutine that is waiting for the multi handle to complete.
 	void *async_event;
-#endif
 	zend_object std;
 } php_curlm;
 

ext/curl/interface.c

@@ -34,9 +34,7 @@
 #include <curl/curl.h>
 #include <curl/easy.h>
 
-#ifdef PHP_ASYNC_API
 #include "curl_async.h"
-#endif
 
 /* As of curl 7.11.1 this is no longer defined inside curl.h */
 #ifndef HttpPost
@@ -176,15 +174,13 @@ void _php_curl_verify_handlers(php_curl *ch, bool reporterror) /* {{{ */
 }
 /* }}} */
 
-#ifdef PHP_ASYNC_API
 /* {{{ */
 PHP_RSHUTDOWN_FUNCTION(curl)
 {
 	curl_async_shutdown();
 	return SUCCESS;
 }
 /* }}} */
-#endif
 
 /* {{{ curl_module_entry */
 zend_module_entry curl_module_entry = {
@@ -194,11 +190,7 @@ zend_module_entry curl_module_entry = {
 	PHP_MINIT(curl),
 	PHP_MSHUTDOWN(curl),
 	NULL,
-#ifdef PHP_ASYNC_API
 	PHP_RSHUTDOWN(curl),
-#else
-	NULL,
-#endif
 	PHP_MINFO(curl),
 	PHP_CURL_VERSION,
 	PHP_MODULE_GLOBALS(curl),
@@ -2421,15 +2413,11 @@ PHP_FUNCTION(curl_exec)
 
 	_php_curl_cleanup_handle(ch);
 
-#ifdef PHP_ASYNC_API
 	if (ZEND_ASYNC_IS_ACTIVE) {
 		error = curl_async_perform(ch->cp);
 	} else {
 		error = curl_easy_perform(ch->cp);
 	}
-#else
-	error = curl_easy_perform(ch->cp);
-#endif
 	SAVE_CURL_ERROR(ch, error);
 
 	if (error != CURLE_OK) {

ext/curl/multi.c

@@ -24,9 +24,7 @@
 #include "Zend/zend_smart_str.h"
 
 #include "curl_private.h"
-#ifdef PHP_ASYNC_API
 #include "curl_async.h"
-#endif
 
 #include <curl/curl.h>
 #include <curl/multi.h>
@@ -223,15 +221,11 @@ PHP_FUNCTION(curl_multi_select)
 		RETURN_THROWS();
 	}
 
-#ifdef PHP_ASYNC_API
 	if (ZEND_ASYNC_IS_ACTIVE) {
 		error = curl_async_select(mh, (int) (timeout * 1000.0), &numfds);
 	} else {
 		error = curl_multi_wait(mh->multi, NULL, 0, (int) (timeout * 1000.0), &numfds);
 	}
-#else
-	error = curl_multi_wait(mh->multi, NULL, 0, (int) (timeout * 1000.0), &numfds);
-#endif
 	if (CURLM_OK != error) {
 		SAVE_CURLM_ERROR(mh, error);
 		RETURN_LONG(-1);
@@ -271,15 +265,11 @@ PHP_FUNCTION(curl_multi_exec)
 	}
 
 	still_running = zval_get_long(z_still_running);
-#ifdef PHP_ASYNC_API
 	if (ZEND_ASYNC_IS_ACTIVE) {
 		error = curl_async_multi_perform(mh, &still_running);
 	} else {
 		error = curl_multi_perform(mh->multi, &still_running);
 	}
-#else
-	error = curl_multi_perform(mh->multi, &still_running);
-#endif
 	ZEND_TRY_ASSIGN_REF_LONG(z_still_running, still_running);
 
 	SAVE_CURLM_ERROR(mh, error);
@@ -372,11 +362,9 @@ PHP_FUNCTION(curl_multi_close)
 
 	mh = Z_CURL_MULTI_P(z_mh);
 
-#ifdef PHP_ASYNC_API
 	if (mh->async_event) {
 		curl_async_dtor(mh);
 	}
-#endif
 
 	for (pz_ch = (zval *)zend_llist_get_first_ex(&mh->easyh, &pos); pz_ch;
 		pz_ch = (zval *)zend_llist_get_next_ex(&mh->easyh, &pos)) {
@@ -575,9 +563,7 @@ static void curl_multi_free_obj(zend_object *object)
 {
 	php_curlm *mh = curl_multi_from_obj(object);
 
-#ifdef PHP_ASYNC_API
 	curl_async_dtor(mh);
-#endif
 
 	zend_llist_position pos;
 	php_curl *ch;

ext/sockets/php_sockets.h

@@ -33,15 +33,13 @@
 # define IS_INVALID_SOCKET(a) (a->bsd_socket < 0)
 #endif
 
-#ifdef PHP_ASYNC_API
 /* Helper macro to avoid compiler warnings about equal expressions */
 #ifdef PHP_WIN32
 # define IS_EAGAIN_OR_EWOULDBLOCK(err) ((err) == EAGAIN || (err) == EWOULDBLOCK)
 #else
 # define IS_EAGAIN_OR_EWOULDBLOCK(err) ((err) == EAGAIN)
 # define INVALID_SOCKET (-1)
 #endif
-#endif
 
 #define PHP_SOCKETS_VERSION PHP_VERSION
 
@@ -81,15 +79,13 @@ typedef struct {
 	int			type;
 	int			error;
 	int			blocking;
-#ifdef PHP_ASYNC_API
 	/* Equals TRUE if the socket was transferred to a nonblocking mode */
 	bool 		non_blocking;
 	/*
 	 * socket type, e.g. SOCK_STREAM, SOCK_DGRAM
 	 * Needed to understand how to work with the buffer correctly.
 	 */
 	int         socket_type;
-#endif
 	zval		zstream;
 	zend_object std;
 } php_socket;

ext/sockets/sockaddr_conv.c

@@ -1,9 +1,7 @@
 #include <php.h>
 #include <php_network.h>
 #include "php_sockets.h"
-#ifdef PHP_ASYNC_API
 #include "main/network_async.h"
-#endif
 
 #ifdef PHP_WIN32
 #include "windows_common.h"
@@ -15,11 +13,7 @@
 extern zend_result php_string_to_if_index(const char *val, unsigned *out);
 
 #ifdef HAVE_IPV6
-#ifdef PHP_ASYNC_API
 # define FREEADDRINFO(addrinfo) is_async ? ZEND_ASYNC_FREEADDRINFO(addrinfo) : freeaddrinfo(addrinfo)
-#else
-# define FREEADDRINFO(addrinfo) freeaddrinfo(addrinfo)
-#endif
 /* Sets addr by hostname, or by ip in string form (AF_INET6) */
 int php_set_inet6_addr(struct sockaddr_in6 *sin6, zend_string *string, php_socket *php_sock) /* {{{ */
 {
@@ -42,7 +36,6 @@ int php_set_inet6_addr(struct sockaddr_in6 *sin6, zend_string *string, php_socke
 #else
 		hints.ai_flags = AI_ADDRCONFIG;
 #endif
-#ifdef PHP_ASYNC_API
 		bool is_async = ZEND_ASYNC_IS_ACTIVE;
 
 		if (is_async) {
@@ -62,16 +55,6 @@ int php_set_inet6_addr(struct sockaddr_in6 *sin6, zend_string *string, php_socke
 #endif
 			return 0;
 		}
-#else
-		if (getaddrinfo(ZSTR_VAL(string), NULL, &hints, &addrinfo) != 0) {
-#ifdef PHP_WIN32
-			PHP_SOCKET_ERROR(php_sock, "Host lookup failed", WSAGetLastError());
-#else
-			PHP_SOCKET_ERROR(php_sock, "Host lookup failed", (-10000 - h_errno));
-#endif
-			return 0;
-		}
-#endif
 
 		if (!addrinfo) {
 #ifdef PHP_WIN32