diff options
| author | Sean Finney <seanius@debian.org> | 2010-02-07 22:19:53 +0100 |
|---|---|---|
| committer | Sean Finney <seanius@debian.org> | 2010-02-07 22:27:07 +0100 |
| commit | c852c28a88fccf6e34a2cb091fdfa72bce2b59c7 (patch) | |
| tree | 91f01b0d06916c78262404096bfd466b8e95e5b5 /sapi/embed | |
| parent | 176cbd0bc99e20bb21f92f0b72df728eafc1e2ce (diff) | |
| parent | 0fab6db7cac8d2be99579dd049f812a8ff98e74f (diff) | |
| download | php-c852c28a88fccf6e34a2cb091fdfa72bce2b59c7.tar.gz | |
Merge branch 'upstream-experimental' into upstream-sid
Diffstat (limited to 'sapi/embed')
| -rw-r--r-- | sapi/embed/config.m4 | 2 | ||||
| -rw-r--r-- | sapi/embed/php_embed.c | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/sapi/embed/config.m4 b/sapi/embed/config.m4 index 2a9fb6336..c9c9030ee 100644 --- a/sapi/embed/config.m4 +++ b/sapi/embed/config.m4 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4 239540 2007-07-11 23:20:37Z jani $ +dnl $Id: config.m4 242949 2007-09-26 15:44:16Z cvs2svn $ dnl PHP_ARG_ENABLE(embed,, diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index f7013dabd..e32c3a387 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -18,6 +18,7 @@ /* $Id: php_embed.c 286569 2009-07-30 20:20:56Z garretts $ */ #include "php_embed.h" +#include "ext/standard/php_standard.h" #ifdef PHP_WIN32 #include <io.h> @@ -134,11 +135,23 @@ extern EMBED_SAPI_API sapi_module_struct php_embed_module = { php_embed_register_variables, /* register server variables */ php_embed_log_message, /* Log message */ NULL, /* Get request time */ + NULL, /* Child terminate */ STANDARD_SAPI_MODULE_PROPERTIES }; /* }}} */ +/* {{{ arginfo ext/standard/dl.c */ +ZEND_BEGIN_ARG_INFO(arginfo_dl, 0) + ZEND_ARG_INFO(0, extension_filename) +ZEND_END_ARG_INFO() +/* }}} */ + +static const zend_function_entry additional_functions[] = { + ZEND_FE(dl, arginfo_dl) + {NULL, NULL, NULL} +}; + EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC) { zend_llist global_vars; @@ -175,6 +188,8 @@ EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC) php_embed_module.ini_entries = malloc(sizeof(HARDCODED_INI)); memcpy(php_embed_module.ini_entries, HARDCODED_INI, sizeof(HARDCODED_INI)); + php_embed_module.additional_functions = additional_functions; + if (argv) { php_embed_module.executable_location = argv[0]; } |