mirror of
https://github.com/php/php-src.git
synced 2026-03-27 09:42:22 +01:00
TLS is already used in TSRM, the way exporting the tsrm cache through a thread local variable is not portable. Additionally, the current patch suffers from bugs which are hard to find, but prevent it to be worky with apache. What is done here is mainly uses the idea from the RFC patch, but - __thread variable is removed - offset math and declarations are removed - extra macros and definitions are removed What is done merely is - use an inline function to access the tsrm cache. The function uses the portable tsrm_tls_get macro which is cheap - all the TSRM_* macros are set to placebo. Thus this opens the way remove them later Except that, the logic is old. TSRMLS_FETCH will have to be done once per thread, then tsrm_get_ls_cache() can be used. Things seeming to be worky are cli, cli server and apache. I also tried to enable bz2 shared and it has worked out of the box. The change is yet minimal diffing to the current master bus is a worky start, IMHO. Though will have to recheck the other previously done SAPIs - embed and cgi. The offsets can be added to the tsrm_resource_type struct, then it'll not be needed to declare them in the userspace. Even the "done" member type can be changed to int16 or smaller, then adding the offset as int16 will not change the struct size. As well on the todo might be removing the hashed storage, thread_id != thread_id and linked list logic in favour of the explicit TLS operations.
242 lines
6.3 KiB
C
242 lines
6.3 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| PHP Version 7 |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 1997-2014 The PHP Group |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Author: Edin Kadribasic <edink@php.net> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
/* $Id$ */
|
|
|
|
#include "php_embed.h"
|
|
#include "ext/standard/php_standard.h"
|
|
|
|
#ifdef PHP_WIN32
|
|
#include <io.h>
|
|
#include <fcntl.h>
|
|
#endif
|
|
|
|
const char HARDCODED_INI[] =
|
|
"html_errors=0\n"
|
|
"register_argc_argv=1\n"
|
|
"implicit_flush=1\n"
|
|
"output_buffering=0\n"
|
|
"max_execution_time=0\n"
|
|
"max_input_time=-1\n\0";
|
|
|
|
static char* php_embed_read_cookies(TSRMLS_D)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static int php_embed_deactivate(TSRMLS_D)
|
|
{
|
|
fflush(stdout);
|
|
return SUCCESS;
|
|
}
|
|
|
|
static inline size_t php_embed_single_write(const char *str, size_t str_length)
|
|
{
|
|
#ifdef PHP_WRITE_STDOUT
|
|
zend_long ret;
|
|
|
|
ret = write(STDOUT_FILENO, str, str_length);
|
|
if (ret <= 0) return 0;
|
|
return ret;
|
|
#else
|
|
size_t ret;
|
|
|
|
ret = fwrite(str, 1, MIN(str_length, 16384), stdout);
|
|
return ret;
|
|
#endif
|
|
}
|
|
|
|
|
|
static size_t php_embed_ub_write(const char *str, size_t str_length TSRMLS_DC)
|
|
{
|
|
const char *ptr = str;
|
|
size_t remaining = str_length;
|
|
size_t ret;
|
|
|
|
while (remaining > 0) {
|
|
ret = php_embed_single_write(ptr, remaining);
|
|
if (!ret) {
|
|
php_handle_aborted_connection();
|
|
}
|
|
ptr += ret;
|
|
remaining -= ret;
|
|
}
|
|
|
|
return str_length;
|
|
}
|
|
|
|
static void php_embed_flush(void *server_context TSRMLS_DC)
|
|
{
|
|
if (fflush(stdout)==EOF) {
|
|
php_handle_aborted_connection();
|
|
}
|
|
}
|
|
|
|
static void php_embed_send_header(sapi_header_struct *sapi_header, void *server_context TSRMLS_DC)
|
|
{
|
|
}
|
|
|
|
static void php_embed_log_message(char *message TSRMLS_DC)
|
|
{
|
|
fprintf (stderr, "%s\n", message);
|
|
}
|
|
|
|
static void php_embed_register_variables(zval *track_vars_array TSRMLS_DC)
|
|
{
|
|
php_import_environment_variables(track_vars_array TSRMLS_CC);
|
|
}
|
|
|
|
static int php_embed_startup(sapi_module_struct *sapi_module)
|
|
{
|
|
if (php_module_startup(sapi_module, NULL, 0)==FAILURE) {
|
|
return FAILURE;
|
|
}
|
|
return SUCCESS;
|
|
}
|
|
|
|
extern EMBED_SAPI_API sapi_module_struct php_embed_module = {
|
|
"embed", /* name */
|
|
"PHP Embedded Library", /* pretty name */
|
|
|
|
php_embed_startup, /* startup */
|
|
php_module_shutdown_wrapper, /* shutdown */
|
|
|
|
NULL, /* activate */
|
|
php_embed_deactivate, /* deactivate */
|
|
|
|
php_embed_ub_write, /* unbuffered write */
|
|
php_embed_flush, /* flush */
|
|
NULL, /* get uid */
|
|
NULL, /* getenv */
|
|
|
|
php_error, /* error handler */
|
|
|
|
NULL, /* header handler */
|
|
NULL, /* send headers handler */
|
|
php_embed_send_header, /* send header handler */
|
|
|
|
NULL, /* read POST data */
|
|
php_embed_read_cookies, /* read Cookies */
|
|
|
|
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;
|
|
#ifdef ZTS
|
|
void ***tsrm_ls = NULL;
|
|
#endif
|
|
|
|
#ifdef HAVE_SIGNAL_H
|
|
#if defined(SIGPIPE) && defined(SIG_IGN)
|
|
signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE in standalone mode so
|
|
that sockets created via fsockopen()
|
|
don't kill PHP if the remote site
|
|
closes it. in apache|apxs mode apache
|
|
does that for us! thies@thieso.net
|
|
20000419 */
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef ZTS
|
|
tsrm_startup(1, 1, 0, NULL);
|
|
tsrm_ls = ts_resource(0);
|
|
*ptsrm_ls = tsrm_ls;
|
|
#endif
|
|
|
|
sapi_startup(&php_embed_module);
|
|
|
|
#ifdef PHP_WIN32
|
|
_fmode = _O_BINARY; /*sets default for file streams to binary */
|
|
setmode(_fileno(stdin), O_BINARY); /* make the stdio mode be binary */
|
|
setmode(_fileno(stdout), O_BINARY); /* make the stdio mode be binary */
|
|
setmode(_fileno(stderr), O_BINARY); /* make the stdio mode be binary */
|
|
#endif
|
|
|
|
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];
|
|
}
|
|
|
|
if (php_embed_module.startup(&php_embed_module)==FAILURE) {
|
|
return FAILURE;
|
|
}
|
|
|
|
zend_llist_init(&global_vars, sizeof(char *), NULL, 0);
|
|
|
|
/* Set some Embedded PHP defaults */
|
|
SG(options) |= SAPI_OPTION_NO_CHDIR;
|
|
SG(request_info).argc=argc;
|
|
SG(request_info).argv=argv;
|
|
|
|
if (php_request_startup(TSRMLS_C)==FAILURE) {
|
|
php_module_shutdown(TSRMLS_C);
|
|
return FAILURE;
|
|
}
|
|
|
|
SG(headers_sent) = 1;
|
|
SG(request_info).no_headers = 1;
|
|
php_register_variable("PHP_SELF", "-", NULL TSRMLS_CC);
|
|
|
|
return SUCCESS;
|
|
}
|
|
|
|
EMBED_SAPI_API void php_embed_shutdown(TSRMLS_D)
|
|
{
|
|
php_request_shutdown((void *) 0);
|
|
php_module_shutdown(TSRMLS_C);
|
|
sapi_shutdown();
|
|
#ifdef ZTS
|
|
tsrm_shutdown();
|
|
#endif
|
|
if (php_embed_module.ini_entries) {
|
|
free(php_embed_module.ini_entries);
|
|
php_embed_module.ini_entries = NULL;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Local variables:
|
|
* tab-width: 4
|
|
* c-basic-offset: 4
|
|
* End:
|
|
* vim600: sw=4 ts=4 fdm=marker
|
|
* vim<600: sw=4 ts=4
|
|
*/
|