-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#include "php_psi_stdinc.h"
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
+#include "zend_constants.h"
+#include "zend_operators.h"
#include "php_psi.h"
+#include "token.h"
#include "parser.h"
-#include "libjit.h"
-#include "libffi.h"
+#define PSI_CPP_SEARCH
+#include "php_psi_cpp.h"
+
+#if HAVE_LIBJIT
+# include "libjit.h"
+# ifndef HAVE_LIBFFI
+# define PSI_ENGINE "jit"
+# endif
+#endif
+#if HAVE_LIBFFI
+# include "libffi.h"
+# define PSI_ENGINE "ffi"
+#endif
ZEND_DECLARE_MODULE_GLOBALS(psi);
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("psi.engine", "ffi", PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals)
- STD_PHP_INI_ENTRY("psi.directory", "psis", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals)
+ STD_PHP_INI_ENTRY("psi.engine", PSI_ENGINE, PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals)
+ STD_PHP_INI_ENTRY("psi.directory", "psi.d", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals)
PHP_INI_END();
-void psi_error(int type, const char *msg, ...)
-{
- char buf[0x1000];
- va_list argv;
-
- va_start(argv, msg);
- vslprintf(buf, 0x1000, msg, argv);
- va_end(argv);
-
- php_error(type, buf);
-}
+static zend_object_handlers psi_object_handlers;
+static zend_class_entry *psi_class_entry;
-int psi_internal_type(impl_type *type)
+zend_class_entry *psi_object_get_class_entry()
{
- switch (type->type) {
- case PSI_T_BOOL:
- return _IS_BOOL;
- case PSI_T_INT:
- case PSI_T_LONG:
- return IS_LONG;
- case PSI_T_FLOAT:
- case PSI_T_DOUBLE:
- return IS_DOUBLE;
- case PSI_T_STRING:
- return IS_STRING;
- case PSI_T_ARRAY:
- return IS_ARRAY;
- default:
- return 0;
- }
+ return psi_class_entry;
}
-zend_internal_arg_info *psi_internal_arginfo(impl *impl)
+static void psi_object_free(zend_object *o)
{
- size_t i;
- zend_internal_arg_info *aip;
- zend_internal_function_info *fi;
-
- aip = calloc(impl->func->args->count + 1, sizeof(*aip));
-
- fi = (zend_internal_function_info *) &aip[0];
- fi->required_num_args = psi_num_min_args(impl);
- fi->return_reference = impl->func->return_reference;
- fi->type_hint = psi_internal_type(impl->func->return_type);
+ psi_object *obj = PSI_OBJ(NULL, o);
- for (i = 0; i < impl->func->args->count; ++i) {
- impl_arg *iarg = impl->func->args->args[i];
- zend_internal_arg_info *ai = &aip[i+1];
-
- ai->name = iarg->var->name;
- ai->type_hint = psi_internal_type(iarg->type);
- if (iarg->var->reference) {
- ai->pass_by_reference = 1;
- }
- if (iarg->var->reference || (iarg->def && iarg->def->type == PSI_T_NULL)) {
- ai->allow_null = 1;
+ if (obj->data) {
+ if (obj->dtor) {
+ obj->dtor(obj->data);
}
+ obj->data = NULL;
}
-
- return aip;
+ zend_object_std_dtor(o);
}
-size_t psi_num_min_args(impl *impl)
+zend_object *psi_object_init_ex(zend_class_entry *ce, void *data, void (*dtor)(void *))
{
- size_t i, n = impl->func->args->count;
+ psi_object *o;
- for (i = 0; i < impl->func->args->count; ++i) {
- if (impl->func->args->args[i]->def) {
- --n;
- }
+ if (!ce) {
+ ce = psi_class_entry;
}
- return n;
-}
-void psi_to_int(impl_val *ret_val, decl_arg *func, zval *return_value)
-{
- switch (real_decl_type(func->type)->type) {
- case PSI_T_FLOAT:
- case PSI_T_DOUBLE:
- RETVAL_DOUBLE(deref_impl_val(0, ret_val, func)->dval);
- convert_to_long(return_value);
- break;
- default:
- RETVAL_LONG(deref_impl_val(0, ret_val, func)->lval);
- }
+ o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
+
+ o->data = data;
+ o->dtor = dtor;
+
+ zend_object_std_init(&o->std, ce);
+ object_properties_init(&o->std, ce);
+ o->std.handlers = &psi_object_handlers;
+ return &o->std;
}
-void psi_to_double(impl_val *ret_val, decl_arg *func, zval *return_value)
+zend_object *psi_object_init(zend_class_entry *ce)
{
- RETVAL_DOUBLE(deref_impl_val(0, ret_val, func)->dval);
+ return psi_object_init_ex(ce, NULL, NULL);
}
-void psi_to_string(impl_val *ret_val, decl_arg *func, zval *return_value)
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_dump, 0, 0, 0)
+ ZEND_ARG_INFO(0, stream)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_dump)
{
- switch (real_decl_type(func->type)->type) {
- case PSI_T_CHAR:
- case PSI_T_SINT8:
- case PSI_T_UINT8:
- if (!func->var->pointer_level) {
- char chr = ret_val->lval;
- RETVAL_STRINGL(&chr, 1);
- } else {
- ret_val = deref_impl_val(1, ret_val, func);
- if (ret_val->ptr) {
- RETVAL_STRING(ret_val->ptr);
- } else {
- RETVAL_EMPTY_STRING();
- }
+ php_stream *s;
+ zval *r = NULL;
+ int fd = STDOUT_FILENO;
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|r!", &r)) {
+ return;
+ }
+ if (r) {
+ php_stream_from_zval(s, r);
+
+ if (SUCCESS != php_stream_cast(s, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void **)&fd, 1)) {
+ RETURN_FALSE;
}
- break;
- case PSI_T_FLOAT:
- case PSI_T_DOUBLE:
- RETVAL_DOUBLE(deref_impl_val(0, ret_val, func)->dval);
- convert_to_string(return_value);
- break;
- default:
- RETVAL_LONG(deref_impl_val(0, ret_val, func)->lval);
- convert_to_string(return_value);
- break;
}
+ psi_context_dump(PSI_G(context), fd);
}
-ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate, 0, 0, 1)
+ ZEND_ARG_INFO(0, file)
+ ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_validate)
{
- impl_arg *iarg;
+ zend_string *file;
+ struct psi_parser_input *I;
+ struct psi_parser P;
+ struct psi_data D = {0};
+ zend_long flags = 0;
+
+#if PHP_DEBUG
+ if (psi_check_env("PSI_DEBUG")) {
+ flags |= PSI_DEBUG;
+ }
+#endif
- if (!impl->func->args->count) {
- return zend_parse_parameters_none();
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|l", &file, &flags)) {
+ return;
}
- ZEND_PARSE_PARAMETERS_START(psi_num_min_args(impl), impl->func->args->count)
- nextarg:
- iarg = impl->func->args->args[_i];
- if (iarg->def) {
- Z_PARAM_OPTIONAL;
- }
- if (PSI_T_BOOL == iarg->type->type) {
- if (iarg->def) {
- iarg->val.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
- }
- Z_PARAM_BOOL(iarg->val.bval);
- } else if (PSI_T_INT == iarg->type->type) {
- if (iarg->def) {
- iarg->val.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
- }
- Z_PARAM_LONG(iarg->val.lval);
- } else if (PSI_T_FLOAT == iarg->type->type) {
- if (iarg->def) {
- iarg->val.dval = zend_strtod(iarg->def->text, NULL);
- }
- Z_PARAM_DOUBLE(iarg->val.dval);
- } else if (PSI_T_STRING == iarg->type->type) {
- struct {char *val; size_t len;} str;
- if (iarg->def) {
- /* FIXME */
- str.len = strlen(iarg->def->text) - 2;
- str.val = &iarg->def->text[1];
- }
- Z_PARAM_STR_EX(iarg->val.str, 1, 0);
- if (iarg->val.str) {
- zend_string_addref(iarg->val.str);
- } else if (iarg->def) {
- iarg->val.str = zend_string_init(str.val, str.len, 0);
- }
- } else {
- error_code = ZPP_ERROR_FAILURE;
- break;
- }
- iarg->_zv = _arg;
- if (_i < _max_num_args) {
- goto nextarg;
- }
- ZEND_PARSE_PARAMETERS_END_EX(return FAILURE);
+ if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
+ RETURN_FALSE;
+ }
+ if (!(I = psi_parser_open_file(&P, file->val, true))) {
+ psi_parser_dtor(&P);
+ RETURN_FALSE;
+ }
- return SUCCESS;
+ psi_parser_parse(&P, I);
+ psi_data_ctor(&D, P.error, P.flags);
+ RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
+ psi_data_dtor(&D);
+ psi_parser_dtor(&P);
+ free(I);
}
-impl_val *psi_do_let(decl_arg *darg)
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate_string, 0, 0, 1)
+ ZEND_ARG_INFO(0, string)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_validate_string)
{
- impl_val *arg_val = &darg->let->out;
- impl_arg *iarg = darg->let->arg;
+ zend_string *string;
+ struct psi_parser_input *I;
+ struct psi_parser P;
+ struct psi_data D = {0};
+ zend_long flags = 0;
+
+#if PHP_DEBUG
+ if (psi_check_env("PSI_DEBUG")) {
+ flags |= PSI_DEBUG;
+ }
+#endif
- if (!iarg) {
- /* let foo = NULL */
- memset(arg_val, 0, sizeof(*arg_val));
- return arg_val;
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &string, &flags)) {
+ return;
}
- switch (darg->let->val->func->type) {
- case PSI_T_BOOLVAL:
- if (iarg->type->type == PSI_T_BOOL) {
- arg_val->cval = iarg->val.cval;
- } else {
- arg_val->cval = zend_is_true(iarg->_zv);
- }
- break;
- case PSI_T_INTVAL:
- if (iarg->type->type == PSI_T_INT) {
- arg_val->lval = iarg->val.lval;
- } else {
- arg_val->lval = zval_get_long(iarg->_zv);
- }
- break;
- case PSI_T_STRVAL:
- if (iarg->type->type == PSI_T_STRING) {
- arg_val->ptr = estrdup(iarg->val.str->val);
- darg->let->mem = arg_val->ptr;
- zend_string_release(iarg->val.str);
- } else {
- zend_string *zs = zval_get_string(iarg->_zv);
- arg_val->ptr = estrdup(zs->val);
- darg->let->mem = arg_val->ptr;
- zend_string_release(zs);
- }
- break;
- case PSI_T_STRLEN:
- if (iarg->type->type == PSI_T_STRING) {
- arg_val->lval = iarg->val.str->len;
- zend_string_release(iarg->val.str);
- } else {
- zend_string *zs = zval_get_string(iarg->_zv);
- arg_val->lval = zs->len;
- zend_string_release(zs);
- }
- break;
- EMPTY_SWITCH_DEFAULT_CASE();
+
+ if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
+ RETURN_FALSE;
+ }
+ if (!(I = psi_parser_open_string(&P, string->val, string->len))) {
+ psi_parser_dtor(&P);
+ RETURN_FALSE;
}
- return arg_val;
+ psi_parser_parse(&P, I);
+ psi_data_ctor(&D, P.error, P.flags);
+ RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
+ psi_data_dtor(&D);
+ psi_parser_dtor(&P);
+ free(I);
}
-void psi_do_set(zval *return_value, set_func *func, decl_vars *vars)
+static ZEND_RESULT_CODE psi_ops_load()
{
- impl_val *val = (impl_val *) &vars->vars[0]->arg->let->ptr;
-
- ZVAL_DEREF(return_value);
- zval_dtor(return_value);
+ struct psi_context_ops *ops = NULL;
+#ifdef HAVE_LIBJIT
+ if (!strcasecmp(PSI_G(engine), "jit")) {
+ ops = psi_libjit_ops();
+ } else
+#endif
+#ifdef HAVE_LIBFFI
+ ops = psi_libffi_ops();
+#endif
- switch (func->type) {
- case PSI_T_TO_STRING:
- psi_to_string(val, vars->vars[0]->arg, return_value);
- break;
- EMPTY_SWITCH_DEFAULT_CASE();
+ if (!ops) {
+ php_error(E_WARNING, "No PSI engine found");
+ return FAILURE;
}
-}
-void psi_do_return(impl *impl, impl_val *ret_val, zval *return_value)
-{
- switch (impl->stmts->ret.list[0]->func->type) {
- case PSI_T_TO_STRING:
- psi_to_string(ret_val, impl->decl->func, return_value);
- break;
- case PSI_T_TO_INT:
- psi_to_int(ret_val, impl->decl->func, return_value);
- break;
- EMPTY_SWITCH_DEFAULT_CASE();
+ PSI_G(ops) = ops;
+ if (ops->load) {
+ return ops->load();
}
+ return SUCCESS;
}
-void psi_do_free(free_stmt *fre)
+static PHP_MINIT_FUNCTION(psi)
{
- size_t i;
+ zend_class_entry ce = {0};
+ unsigned flags = 0;
- for (i = 0; i < fre->vars->count; ++i) {
- decl_var *dvar = fre->vars->vars[i];
+ REGISTER_INI_ENTRIES();
- if (dvar->arg && dvar->arg->let->out.ptr) {
- free(dvar->arg->let->out.ptr);
- dvar->arg->let->out.ptr = NULL;
- }
- }
-}
+ zend_register_long_constant(ZEND_STRL("PSI_DEBUG"), PSI_DEBUG, CONST_CS|CONST_PERSISTENT, module_number);
+ zend_register_long_constant(ZEND_STRL("PSI_SILENT"), PSI_SILENT, CONST_CS|CONST_PERSISTENT, module_number);
-void psi_do_clean(impl *impl)
-{
- size_t i;
+ INIT_NS_CLASS_ENTRY(ce, "psi", "object", NULL);
+ psi_class_entry = zend_register_internal_class_ex(&ce, NULL);
+ psi_class_entry->create_object = psi_object_init;
- for (i = 0; i < impl->func->args->count; ++i ) {
- impl_arg *iarg = impl->func->args->args[i];
+ memcpy(&psi_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+ psi_object_handlers.offset = XtOffsetOf(psi_object, std);
+ psi_object_handlers.free_obj = psi_object_free;
+ psi_object_handlers.clone_obj = NULL;
- switch (iarg->type->type) {
- case PSI_T_STRING:
- if (iarg->val.str) {
- zend_string_release(iarg->val.str);
- }
- break;
- }
+ if (SUCCESS != psi_ops_load()) {
+ return FAILURE;
}
- for (i = 0; i < impl->decl->args->count; ++i) {
- decl_arg *darg = impl->decl->args->args[i];
-
- if (darg->let && darg->let->mem) {
- efree(darg->let->mem);
- darg->let->mem = NULL;
- }
+ if (psi_check_env("PSI_DEBUG")) {
+ flags |= PSI_DEBUG;
+ }
+ if (psi_check_env("PSI_SILENT")) {
+ flags |= PSI_SILENT;
}
+
+ PSI_G(search_path) = pemalloc(strlen(PSI_G(directory)) + strlen(psi_cpp_search) + 1 + 1, 1);
+ sprintf(PSI_G(search_path), "%s:%s", PSI_G(directory), psi_cpp_search);
+
+ PSI_G(context) = psi_context_init(NULL, PSI_G(ops), psi_error_wrapper, flags);
+ psi_context_build(PSI_G(context), PSI_G(directory));
+
+ return SUCCESS;
}
-PHP_MINIT_FUNCTION(psi)
+static PHP_MSHUTDOWN_FUNCTION(psi)
{
- PSI_ContextOps *ops;
+ if (psi_check_env("PSI_DUMP")) {
+ psi_context_dump(PSI_G(context), STDOUT_FILENO);
+ }
- REGISTER_INI_ENTRIES();
+ psi_context_free(&PSI_G(context));
- if (!strcasecmp(PSI_G(engine), "jit")) {
- ops = PSI_Libjit();
- } else {
- ops = PSI_Libffi();
+ if (PSI_G(ops)->free) {
+ PSI_G(ops)->free();
}
- PSI_ContextInit(&PSI_G(context), ops, psi_error);
- PSI_ContextBuild(&PSI_G(context), PSI_G(directory));
+ UNREGISTER_INI_ENTRIES();
return SUCCESS;
}
-PHP_MSHUTDOWN_FUNCTION(psi)
-{
- PSI_ContextDtor(&PSI_G(context));
-
- UNREGISTER_INI_ENTRIES();
+#if defined(COMPILE_DL_PSI) && defined(ZTS)
+static PHP_RINIT_FUNCTION(psi)
+{
+ ZEND_TSRMLS_CACHE_UPDATE();
return SUCCESS;
}
+#endif
-/* Remove if there's nothing to do at request start */
-/* {{{ PHP_RINIT_FUNCTION
- */
-PHP_RINIT_FUNCTION(psi)
+static PHP_MINFO_FUNCTION(psi)
{
-#if defined(COMPILE_DL_PSI) && defined(ZTS)
- ZEND_TSRMLS_CACHE_UPDATE();
+ php_info_print_table_start();
+ php_info_print_table_header(2, "PSI Support", "enabled");
+ php_info_print_table_row(2, "Extension Version", PHP_PSI_VERSION);
+ php_info_print_table_row(2, "Search Path", PSI_G(search_path));
+ php_info_print_table_end();
+
+ php_info_print_table_start();
+ php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
+ php_info_print_table_row(3, "libffi",
+#ifndef PHP_PSI_LIBFFI_VERSION
+# define PHP_PSI_LIBFFI_VERSION "unknown"
#endif
- return SUCCESS;
+#ifdef HAVE_LIBFFI
+ PHP_PSI_LIBFFI_VERSION, "unknown"
+#else
+ "disabled", "disabled"
+#endif
+ );
+ php_info_print_table_row(3, "libjit",
+#ifdef HAVE_LIBJIT
+ "unknown", "unknown"
+#else
+ "disabled", "disabled"
+#endif
+ );
+
+ DISPLAY_INI_ENTRIES();
}
-/* }}} */
-/* Remove if there's nothing to do at request end */
-/* {{{ PHP_RSHUTDOWN_FUNCTION
- */
-PHP_RSHUTDOWN_FUNCTION(psi)
+static void ptr_free(void *ptr)
{
- return SUCCESS;
+ free(*(void **) ptr);
}
-/* }}} */
-PHP_MINFO_FUNCTION(psi)
+static PHP_GINIT_FUNCTION(psi)
{
- php_info_print_table_start();
- php_info_print_table_header(2, "psi support", "enabled");
- php_info_print_table_end();
+ char *tmp;
+ struct psi_plist **bl_decls = &psi_globals->blacklist.decls;
+ struct psi_plist **bl_vars = &psi_globals->blacklist.vars;
+
+ *bl_decls = psi_plist_init(ptr_free);
+ *bl_vars = psi_plist_init(ptr_free);
+
+#define BL_ADD(D, d) \
+ tmp = strdup(d); \
+ *D = psi_plist_add(*D, &tmp)
+#define BL_DECL_ADD(d) BL_ADD(bl_decls, d)
+#define BL_VAR_ADD(d) BL_ADD(bl_vars, d)
+
+ BL_DECL_ADD("dlsym");
+ BL_DECL_ADD("alloca");
+ BL_DECL_ADD("atexit");
+ BL_DECL_ADD("at_quick_exit");
+
+ /* missing */
+ BL_DECL_ADD("_IO_cookie_init");
+ BL_DECL_ADD("bindresvport6");
+
+ /* va_list as arg */
+ BL_DECL_ADD("*v*printf");
+ BL_DECL_ADD("*v*scanf");
+ BL_DECL_ADD("vsyslog");
+
+ /* LFS/LFO for 32bit */
+ BL_DECL_ADD("*stat*64");
+ BL_DECL_ADD("*glob*64");
+ /* Hurd only */
+ BL_DECL_ADD("getumask");
+
+ /* using hidden structs */
+ BL_VAR_ADD("_IO_2_*");
+}
- DISPLAY_INI_ENTRIES();
+static PHP_GSHUTDOWN_FUNCTION(psi)
+{
+ psi_plist_free(psi_globals->blacklist.decls);
}
-const zend_function_entry psi_functions[] = {
+
+static const zend_function_entry psi_functions[] = {
+ PHP_FE(psi_dump, ai_psi_dump)
+ PHP_FE(psi_validate, ai_psi_validate)
+ PHP_FE(psi_validate_string, ai_psi_validate_string)
PHP_FE_END
};
psi_functions,
PHP_MINIT(psi),
PHP_MSHUTDOWN(psi),
+#if defined(COMPILE_DL_PSI) && defined(ZTS)
PHP_RINIT(psi), /* Replace with NULL if there's nothing to do at request start */
- PHP_RSHUTDOWN(psi), /* Replace with NULL if there's nothing to do at request end */
+#else
+ NULL,
+#endif
+ NULL,
PHP_MINFO(psi),
PHP_PSI_VERSION,
- STANDARD_MODULE_PROPERTIES
+ ZEND_MODULE_GLOBALS(psi),
+ PHP_GINIT(psi),
+ PHP_GSHUTDOWN(psi),
+ NULL, /* post-deactivate */
+ STANDARD_MODULE_PROPERTIES_EX
};
#ifdef COMPILE_DL_PSI
projects / m6w6 / ext-psi / blobdiff