Skip to content

Feature: Export zend_autoload original handler function pointer #6027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cheplv wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature: Export zend_autoload original handler function pointer #6027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7429f28
Export zend_autoload original handler function pointer
cheplv Mar 5, 2026
929efd4
Add php_swoole_api.h header to installed extension headers
cheplv Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1549,7 +1549,7 @@ EOF
AC_MSG_RESULT([disabled])
fi

PHP_INSTALL_HEADERS([ext/swoole], [ext-src/*.h config.h php_swoole.h \
PHP_INSTALL_HEADERS([ext/swoole], [ext-src/*.h config.h php_swoole.h php_swoole_api.h \
include/*.h \
stubs/*.h \
thirdparty/*.h \
Expand Down
3 changes: 3 additions & 0 deletions ext-src/php_swoole_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@ extern zend_class_entry *swoole_error_ce;
extern zend_class_entry *swoole_resolve_context_ce;
extern zend_object_handlers swoole_resolve_context_handlers;

// Export zend_autoload hook
extern zend_class_entry *(*swoole_hook_zend_autoload)(zend_string *name, zend_string *lc_name);

PHP_FUNCTION(swoole_clear_dns_cache);
PHP_FUNCTION(swoole_last_error);
PHP_FUNCTION(swoole_set_process_name);
Expand Down
9 changes: 4 additions & 5 deletions ext-src/swoole_coroutine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,8 +953,7 @@ void *PHPCoroutine::stack_base(PHPContext *ctx) {
#endif /* ZEND_CHECK_STACK_LIMIT */

/* hook autoload */

static zend_class_entry *(*original_zend_autoload)(zend_string *name, zend_string *lc_name);
zend_class_entry *(*swoole_hook_zend_autoload)(zend_string *name, zend_string *lc_name) = nullptr;

struct AutoloadContext {
Coroutine *coroutine;
Expand All @@ -969,7 +968,7 @@ struct AutoloadQueue {
static zend_class_entry *swoole_coroutine_autoload(zend_string *name, zend_string *lc_name) {
auto current = Coroutine::get_current();
if (!current) {
return original_zend_autoload(name, lc_name);
return swoole_hook_zend_autoload(name, lc_name);
}

ZEND_ASSERT(EG(in_autoload) != nullptr);
Expand Down Expand Up @@ -998,7 +997,7 @@ static zend_class_entry *swoole_coroutine_autoload(zend_string *name, zend_strin
queue.queue = &queue_object;

zend_hash_add_ptr(SWOOLE_G(in_autoload), lc_name, &queue);
zend_class_entry *ce = original_zend_autoload(name, lc_name);
zend_class_entry *ce = swoole_hook_zend_autoload(name, lc_name);
zend_hash_del(SWOOLE_G(in_autoload), lc_name);

AutoloadContext *pending_context = nullptr;
Expand Down Expand Up @@ -1066,7 +1065,7 @@ void php_swoole_coroutine_minit(int module_number) {
}

/* hook autoload */
original_zend_autoload = zend_autoload;
swoole_hook_zend_autoload = zend_autoload;
zend_autoload = swoole_coroutine_autoload;
SWOOLE_G(in_autoload) = nullptr;
}
Expand Down