Skip to content

Commit 2b442e9

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents fa685fb + 642c944 commit 2b442e9

File tree

3 files changed

+78
-6
lines changed

3 files changed

+78
-6
lines changed

.gitignore

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# from svn:ignore
2+
.deps
3+
.libs
4+
.php-version
5+
.rbenv-version
6+
acinclude.m4
7+
aclocal.m4
8+
autom4te.cache
9+
build
10+
config.cache
11+
config.guess
12+
config.h
13+
config.h.in
14+
config.log
15+
config.nice
16+
config.status
17+
config.sub
18+
configure
19+
configure.ac
20+
configure.in
21+
extras
22+
include
23+
install-sh
24+
libtool
25+
ltmain.sh
26+
Makefile
27+
Makefile.fragments
28+
Makefile.global
29+
Makefile.objects
30+
missing
31+
mkinstalldirs
32+
modules
33+
run-tests.php
34+
tmp-php.ini
35+
36+
# General Ignores
37+
*~
38+
.#*
39+
*.dep
40+
*.
41+
*.slo
42+
*.mk
43+
*.mem
44+
*.gcda
45+
*.gcno
46+
*.la
47+
*.lo
48+
*.loT
49+
*.o
50+
*.a
51+
*.ncb
52+
*.opt
53+
*.plg
54+
*swp
55+
*.patch
56+
*.tgz
57+
*.tar.gz
58+
*.tar.bz2
59+
.FBCIndex
60+
.FBCLockFolder
61+
core
62+
63+
# Test specific Ignores
64+
tests/*/*.diff
65+
tests/*/*.exp
66+
tests/*/*.log
67+
tests/*/*.out
68+
tests/*/*.php
69+
tests/*/*.sh
70+
71+
# coverage
72+
/coverage.info
73+
/reports

async.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -972,4 +972,8 @@ zend_module_entry async_module_entry = {
972972
PHP_GSHUTDOWN(async),
973973
NULL,
974974
STANDARD_MODULE_PROPERTIES_EX
975-
};
975+
};
976+
977+
#ifdef COMPILE_DL_ASYNC
978+
ZEND_GET_MODULE(async)
979+
#endif

config.m4

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ PHP_ARG_WITH([async_libuv],
99
[Build True Async with LibUv support])], yes)
1010

1111
if test "$PHP_ASYNC" = "yes"; then
12-
13-
if test "$PHP_ASYNC_API" != "yes" && test "$PHP_EXPERIMENTAL_ASYNC_API" != "yes"; then
14-
AC_MSG_ERROR([PHP TRUE ASYNC API is required. Please configure PHP with --enable-experimental-async-api])
15-
fi
16-
1712
dnl Define a symbol for C code.
1813
AC_DEFINE([PHP_ASYNC], 1, [Enable True Async API])
1914

0 commit comments

Comments
 (0)