Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 ext.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func registerExtensions() {
}

registerOnce.Do(func() {
C.register_extensions(extensions[0], C.int(len(extensions)))
C.register_extensions((**C.zend_module_entry)(unsafe.Pointer(&extensions[0])), C.int(len(extensions)))
extensions = nil
})
}
6 changes: 3 additions & 3 deletions frankenphp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@ int frankenphp_reset_opcache(void) {

int frankenphp_get_current_memory_limit() { return PG(memory_limit); }

static zend_module_entry *modules = NULL;
static zend_module_entry **modules = NULL;
static int modules_len = 0;
static int (*original_php_register_internal_extensions_func)(void) = NULL;

Expand All @@ -1273,7 +1273,7 @@ PHPAPI int register_internal_extensions(void) {
}

for (int i = 0; i < modules_len; i++) {
if (zend_register_internal_module(&modules[i]) == NULL) {
if (zend_register_internal_module(modules[i]) == NULL) {
return FAILURE;
}
}
Expand All @@ -1284,7 +1284,7 @@ PHPAPI int register_internal_extensions(void) {
return SUCCESS;
}

void register_extensions(zend_module_entry *m, int len) {
void register_extensions(zend_module_entry **m, int len) {
modules = m;
modules_len = len;

Expand Down
2 changes: 1 addition & 1 deletion frankenphp.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ void frankenphp_register_bulk(
ht_key_value_pair auth_type, ht_key_value_pair remote_ident,
ht_key_value_pair request_uri, ht_key_value_pair ssl_cipher);

void register_extensions(zend_module_entry *m, int len);
void register_extensions(zend_module_entry **m, int len);

#endif
Loading