index b5c8b7a..58aae9f 100644

@@ -3707,6 +3707,70 @@ ZEND_API void zend_disable_functions(const char *function_list) /* {{{ */

}

/* }}} */

static zend_always_inline zend_class_entry *get_scope(zend_execute_data *frame)

{

return frame && frame->func ? frame->func->common.scope : NULL;

index 8cde831..f06c07a 100644

@@ -405,6 +405,7 @@ static zend_always_inline zend_result zend_register_class_alias(const char *name

zend_register_class_alias_ex(ZEND_NS_NAME(ns, name), sizeof(ZEND_NS_NAME(ns, name))-1, ce, 1)

ZEND_API void zend_disable_functions(const char *function_list);

ZEND_API ZEND_COLD void zend_wrong_param_count(void);

ZEND_API ZEND_COLD void zend_wrong_property_read(zval *object, zval *property);

index d571a62..3857a5c 100644

#include "zend_fibers.h"

#include "zend_fibers_arginfo.h"

#ifdef HAVE_VALGRIND

# include <valgrind/valgrind.h>

#endif

# include <ucontext.h>

#endif

@@ -93,7 +99,12 @@ struct _zend_fiber_stack {

size_t asan_size;

#endif

/* Embedded ucontext to avoid unnecessary memory allocations. */

ucontext_t ucontext;

#elif BOOST_CONTEXT_SHADOW_STACK

@@ -154,7 +165,7 @@ static zend_always_inline void zend_fiber_restore_vm_state(zend_fiber_vm_state *

#endif

}

ZEND_TLS zend_fiber_transfer *transfer_data;

#else

/* boost_context_data is our customized definition of struct transfer_t as

@@ -207,12 +218,16 @@ static zend_fiber_stack *zend_fiber_stack_allocate(size_t size)

{

void *pointer;

const size_t page_size = zend_fiber_get_page_size();

const size_t minimum_stack_size = page_size + ZEND_FIBER_GUARD_PAGES * page_size

#ifdef __SANITIZE_ADDRESS__

// necessary correction due to ASAN redzones

* 6

#endif

;

if (size < minimum_stack_size) {

zend_throw_exception_ex(NULL, 0, "Fiber stack size is too small, it needs to be at least %zu bytes", minimum_stack_size);

@@ -220,6 +235,25 @@ static zend_fiber_stack *zend_fiber_stack_allocate(size_t size)

}

const size_t stack_size = (size + page_size - 1) / page_size * page_size;

const size_t alloc_size = stack_size + ZEND_FIBER_GUARD_PAGES * page_size;

#ifdef ZEND_WIN32

@@ -269,13 +303,25 @@ static zend_fiber_stack *zend_fiber_stack_allocate(size_t size)

}

# endif

#endif

zend_fiber_stack *stack = emalloc(sizeof(zend_fiber_stack));

stack->pointer = (void *) ((uintptr_t) pointer + ZEND_FIBER_GUARD_PAGES * page_size);

stack->size = stack_size;

/* shadow stack saves ret address only, need less space */

stack->ss_size= stack_size >> 5;

@@ -311,6 +357,10 @@ static void zend_fiber_stack_free(zend_fiber_stack *stack)

VALGRIND_STACK_DEREGISTER(stack->valgrind_stack_id);

#endif

const size_t page_size = zend_fiber_get_page_size();

void *pointer = (void *) ((uintptr_t) stack->pointer - ZEND_FIBER_GUARD_PAGES * page_size);

@@ -326,8 +376,9 @@ static void zend_fiber_stack_free(zend_fiber_stack *stack)

#else

munmap(pointer, stack->size + ZEND_FIBER_GUARD_PAGES * page_size);

#endif

munmap(stack->ss_base, stack->ss_size);

#endif

@@ -358,14 +409,19 @@ ZEND_API void* zend_fiber_stack_base(zend_fiber_stack *stack)

}

#endif

static ZEND_NORETURN void zend_fiber_trampoline(void)

#else

static ZEND_NORETURN void zend_fiber_trampoline(boost_context_data data)

#endif

{

/* Initialize transfer struct with a copy of passed data. */

zend_fiber_transfer transfer = *transfer_data;

#else

zend_fiber_transfer transfer = *data.transfer;

@@ -377,7 +433,7 @@ static ZEND_NORETURN void zend_fiber_trampoline(boost_context_data data)

__sanitizer_finish_switch_fiber(NULL, &from->stack->asan_pointer, &from->stack->asan_size);

#endif

/* Get the context that resumed us and update its handle to allow for symmetric coroutines. */

from->handle = data.handle;

#endif

@@ -395,8 +451,13 @@ static ZEND_NORETURN void zend_fiber_trampoline(boost_context_data data)

/* Final context switch, the fiber must not be resumed afterwards! */

zend_fiber_switch_context(&transfer);

/* Abort here because we are in an inconsistent program state. */

abort();

}

ZEND_API void zend_fiber_switch_block(void)

@@ -423,7 +484,20 @@ ZEND_API zend_result zend_fiber_init_context(zend_fiber_context *context, void *

return FAILURE;

}

ucontext_t *handle = &context->stack->ucontext;

getcontext(handle);

@@ -516,7 +590,14 @@ ZEND_API void zend_fiber_switch_context(zend_fiber_transfer *transfer)

to->stack->asan_size);

#endif

transfer_data = transfer;

swapcontext(from->handle, to->handle);

@@ -532,7 +613,7 @@ ZEND_API void zend_fiber_switch_context(zend_fiber_transfer *transfer)

to = transfer->context;

/* Get the context that resumed us and update its handle to allow for symmetric coroutines. */

to->handle = data.handle;

#endif

@@ -1127,7 +1208,24 @@ void zend_fiber_init(void)

{

zend_fiber_context *context = ecalloc(1, sizeof(zend_fiber_context));

// Main fiber stack is only needed if ASan or ucontext is enabled.

context->stack = emalloc(sizeof(zend_fiber_stack));

@@ -1147,7 +1245,10 @@ void zend_fiber_init(void)

void zend_fiber_shutdown(void)

{

efree(EG(main_fiber_context)->stack);

#endif

index 0105106..2eb9f8f 100644

#include "libxml_arginfo.h"

/* a true global for initialization */

static bool php_libxml_initialized = false;

static bool php_libxml_per_request_initialization = true;

@@ -983,6 +1002,39 @@ PHP_LIBXML_API void php_libxml_switch_context(const zval *context, zval *oldcont

static PHP_MINIT_FUNCTION(libxml)

{

php_libxml_initialize();

register_libxml_symbols(module_number);

@@ -1020,6 +1072,8 @@ static PHP_MINIT_FUNCTION(libxml)

static PHP_RINIT_FUNCTION(libxml)

{

if (php_libxml_per_request_initialization) {

/* report errors via handler rather than stderr */

xmlSetGenericErrorFunc(NULL, php_libxml_error_handler);

@@ -1047,6 +1101,8 @@ static PHP_RSHUTDOWN_FUNCTION(libxml)

static PHP_MSHUTDOWN_FUNCTION(libxml)

{

if (!php_libxml_per_request_initialization) {

xmlSetGenericErrorFunc(NULL, NULL);

@@ -1060,6 +1116,8 @@ static PHP_MSHUTDOWN_FUNCTION(libxml)

static zend_result php_libxml_post_deactivate(void)

{

/* reset libxml generic error handling */

if (php_libxml_per_request_initialization) {

xmlSetGenericErrorFunc(NULL, NULL);

@@ -1085,6 +1143,13 @@ static zend_result php_libxml_post_deactivate(void)

static PHP_MINFO_FUNCTION(libxml)

{

php_info_print_table_start();

php_info_print_table_row(2, "libXML support", "active");

php_info_print_table_row(2, "libXML Compiled Version", LIBXML_DOTTED_VERSION);

@@ -1097,6 +1162,8 @@ static PHP_MINFO_FUNCTION(libxml)

/* {{{ Set the streams context for the next libxml document load or write */

PHP_FUNCTION(libxml_set_streams_context)

{

zval *arg;

ZEND_PARSE_PARAMETERS_START(1, 1)

@@ -1120,6 +1187,8 @@ PHP_LIBXML_API bool php_libxml_uses_internal_errors(void)

/* {{{ Disable libxml errors and allow user to fetch error information as needed */

PHP_FUNCTION(libxml_use_internal_errors)

{

bool use_errors, use_errors_is_null = true;

ZEND_PARSE_PARAMETERS_START(0, 1)

@@ -1173,6 +1242,8 @@ static void php_libxml_create_error_object(zval *return_value, const xmlError *e

/* {{{ Retrieve last error from libxml */

PHP_FUNCTION(libxml_get_last_error)

{

ZEND_PARSE_PARAMETERS_NONE();

const xmlError *error;

@@ -1194,6 +1265,8 @@ PHP_FUNCTION(libxml_get_last_error)

/* {{{ Retrieve array of errors */

PHP_FUNCTION(libxml_get_errors)

{

ZEND_PARSE_PARAMETERS_NONE();

if (LIBXML(error_list)) {

@@ -1215,6 +1288,8 @@ PHP_FUNCTION(libxml_get_errors)

/* {{{ Clear last error from libxml */

PHP_FUNCTION(libxml_clear_errors)

{

ZEND_PARSE_PARAMETERS_NONE();

xmlResetLastError();

@@ -1235,6 +1310,8 @@ PHP_LIBXML_API bool php_libxml_disable_entity_loader(bool disable) /* {{{ */

/* {{{ Disable/Enable ability to load external entities */

PHP_FUNCTION(libxml_disable_entity_loader)

{

bool disable = true;

ZEND_PARSE_PARAMETERS_START(0, 1)

@@ -1249,6 +1326,8 @@ PHP_FUNCTION(libxml_disable_entity_loader)

/* {{{ Changes the default external entity loader */

PHP_FUNCTION(libxml_set_external_entity_loader)

{

zend_fcall_info fci;

zend_fcall_info_cache fcc;

@@ -1270,6 +1349,8 @@ PHP_FUNCTION(libxml_set_external_entity_loader)

/* {{{ Get the current external entity loader, or null if the default loader is installer. */

PHP_FUNCTION(libxml_get_external_entity_loader)

{

ZEND_PARSE_PARAMETERS_NONE();

if (ZEND_FCC_INITIALIZED(LIBXML(entity_loader_callback))) {

index cb134e9..b1ef0af 100644

@@ -437,8 +437,8 @@ PHP_MINIT_FUNCTION(openssl)

/* override the default tcp socket provider */

php_stream_xport_register("tcp", php_openssl_ssl_socket_factory);

REGISTER_INI_ENTRIES();

@@ -2304,7 +2304,7 @@ PHP_FUNCTION(openssl_pkey_get_details)

array_init(return_value);

add_assoc_long(return_value, "bits", EVP_PKEY_bits(pkey));

add_assoc_stringl(return_value, "key", pbio, pbio_len);

zend_long ktype = php_openssl_pkey_get_details(return_value, pkey);

add_assoc_long(return_value, "type", ktype);

index 667948f..96ee360 100644

#include "php_ini.h"

#include "ext/standard/info.h"

#include "SAPI.h"

#include "php_pdo_sqlite.h"

#include "php_pdo_sqlite_int.h"

#include "zend_exceptions.h"

index 537aefa..a55cbd5 100644

#include "php.h"

#include "php_ini.h"

#include "ext/standard/info.h"

#include "php_pdo_sqlite.h"

#include "php_pdo_sqlite_int.h"

#include "zend_exceptions.h"

index 8b72fff..6f8a63c 100644

@@ -342,8 +342,8 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */

php_register_url_stream_wrapper("file", &php_plain_files_wrapper);

php_register_url_stream_wrapper("glob", &php_glob_stream_wrapper);

php_register_url_stream_wrapper("data", &php_stream_rfc2397_wrapper);

return SUCCESS;

}

index 4e8722d..1343330 100644

@@ -33,6 +33,11 @@ PHPAPI ZEND_COLD void php_print_credits(int flag) /* {{{ */

PUTS("PHP Credits\n");

}

if (flag & PHP_CREDITS_GROUP) {

/* Group */

index 509135a..981ea04 100644

@@ -44,10 +44,12 @@ CREDIT_LINE("ODBC", "Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R

CREDIT_LINE("Opcache", "Andi Gutmans, Zeev Suraski, Stanislav Malyshev, Dmitry Stogov, Xinchen Hui");

CREDIT_LINE("OpenSSL", "Stig Venaas, Wez Furlong, Sascha Kettler, Scott MacVicar, Eliot Lear");

CREDIT_LINE("pcntl", "Jason Greene, Arnaud Le Blanc");

CREDIT_LINE("Perl Compatible Regexps", "Andrei Zmievski");

CREDIT_LINE("PHP Archive", "Gregory Beaver, Marcus Boerger");

CREDIT_LINE("PHP Data Objects", "Wez Furlong, Marcus Boerger, Sterling Hughes, George Schlossnagle, Ilia Alshanetsky");

CREDIT_LINE("PHP hash", "Sara Golemon, Rasmus Lerdorf, Stefan Esser, Michael Wallner, Scott MacVicar");

CREDIT_LINE("Posix", "Kristian Koehntopp");

CREDIT_LINE("PostgreSQL driver for PDO", "Edin Kadribasic, Ilia Alshanetsky");

CREDIT_LINE("PostgreSQL", "Jouni Ahto, Zeev Suraski, Yasuo Ohgaki, Chris Kings-Lynne");

@@ -70,6 +72,8 @@ CREDIT_LINE("System V Shared Memory", "Christian Cartus");

CREDIT_LINE("tidy", "John Coggeshall, Ilia Alshanetsky");

CREDIT_LINE("tokenizer", "Andrei Zmievski, Johannes Schlueter");

CREDIT_LINE("uri", "Máté Kocsis, Tim Düsterhus, Ignace Nyamagana Butera, Arnaud Le Blanc, Dennis Snell, Niels Dossche, Nicolas Grekas");

CREDIT_LINE("XML", "Stig Bakken, Thies C. Arntzen, Sterling Hughes");

CREDIT_LINE("XMLReader", "Rob Richards");

CREDIT_LINE("XMLWriter", "Rob Richards, Pierre-Alain Joye");

index 203a9b9..0d78de1 100644

@@ -318,7 +318,7 @@ static void add_token(

zend_hash_next_index_insert_new(return_value_ht, &token);

}

{

zval source_zval;

zend_lex_state original_lex_state;

index 448576a..7209487 100644

@@ -551,6 +551,7 @@ void fcgi_shutdown(void)

{

if (is_initialized) {

zend_hash_destroy(&fcgi_mgmt_vars);

}

is_fastcgi = 0;

if (allowed_clients) {

index 79e2afe..0956f43 100644

cgi: $(SAPI_CGI_PATH)

$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FASTCGI_OBJS) $(PHP_CGI_OBJS)

install-cgi: $(SAPI_CGI_PATH)

@echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/"

index 6db96a4..77b7547 100644

+----------------------------------------------------------------------+

*/

#include "php.h"

#include "php_globals.h"

#include "php_variables.h"

@@ -1870,7 +1871,8 @@ int main(int argc, char *argv[])

SG(request_info).path_translated = NULL;

#endif

if (!cgi && !fastcgi && !bindpath) {

cgi_sapi_module.additional_functions = additional_functions;

}

@@ -1952,9 +1954,10 @@ consult the installation file that came with this distribution, or visit \n\

}

/* make php call us to get _ENV vars */

if (fastcgi) {

/* How many times to run PHP scripts before dying */

if (getenv("PHP_FCGI_MAX_REQUESTS")) {

@@ -2677,3 +2680,23 @@ consult the installation file that came with this distribution, or visit \n\

return exit_status;

}

/* }}} */

index aa1d642..649533d 100644

cli: $(SAPI_CLI_PATH)

$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CLI_OBJS)

install-cli: $(SAPI_CLI_PATH)

@echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/"

index 460acb6..0ecdd90 100644

+----------------------------------------------------------------------+

*/

#include "php.h"

#include "php_globals.h"

#include "php_variables.h"

@@ -1395,6 +1396,15 @@ int main(int argc, char *argv[])

* exiting.

*/

cleanup_ps_args(argv);

exit(exit_status);

}

/* }}} */

index 06cd1fb..5fb7754 100644

@@ -241,8 +241,8 @@ EMBED_SAPI_API int php_embed_init(int argc, char **argv)

return FAILURE;

}

php_register_variable("PHP_SELF", "-", NULL);

return SUCCESS;

index 3b09f6a..263b3ff 100644

@@ -6,7 +6,7 @@ $(SAPI_PHPDBG_SHARED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_O

$(BUILD_PHPDBG_SHARED)

$(SAPI_PHPDBG_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)

%.c: %.y

%.c: %.l

index 4ef83be..0c3aa8c 100644

+----------------------------------------------------------------------+

*/

#include "phpdbg.h"

#include "phpdbg_prompt.h"

#include "phpdbg_bp.h"

@@ -144,6 +146,34 @@ static inline void php_phpdbg_globals_ctor(zend_phpdbg_globals *pg) /* {{{ */

#endif

} /* }}} */

static PHP_MINIT_FUNCTION(phpdbg) /* {{{ */

{

zend_hash_init(&PHPDBG_G(bp)[PHPDBG_BREAK_FILE], 8, NULL, php_phpdbg_destroy_bp_file, 0);

@@ -173,6 +203,9 @@ static PHP_MINIT_FUNCTION(phpdbg) /* {{{ */

static PHP_MSHUTDOWN_FUNCTION(phpdbg) /* {{{ */

{

zend_hash_destroy(&PHPDBG_G(registered));

phpdbg_destroy_watchpoints();

@@ -1111,7 +1144,7 @@ php_stream *phpdbg_stream_url_wrap_php(php_stream_wrapper *wrapper, const char *

return PHPDBG_G(orig_url_wrap_php)->wops->stream_opener(wrapper, path, mode, options, opened_path, context STREAMS_CC);

} /* }}} */

{

sapi_module_struct *phpdbg = &phpdbg_sapi_module;

char *sapi_name;

index e5f6413..487a2e6 100644

@@ -182,7 +182,7 @@ int phpdbg_do_parse(phpdbg_param_t *stack, char *input);

#ifndef _WIN32

# define PHPDBG_DEFAULT_FLAGS (PHPDBG_IS_QUIET | PHPDBG_IS_COLOURED | PHPDBG_IS_BP_ENABLED | PHPDBG_HAS_PAGINATION)

#else

#endif /* }}} */

/* {{{ output descriptors */

@@ -313,4 +313,7 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg)

zend_ulong lines; /* max number of lines to display */

ZEND_END_MODULE_GLOBALS(phpdbg) /* }}} */

#endif /* PHPDBG_H */

index 9877d60..d27a228 100644

@@ -754,7 +754,7 @@ PHPDBG_API char *phpdbg_read_input(const char *buffered) /* {{{ */

ignored if compiled without readline integration. */

if (!isatty(PHPDBG_G(io)[PHPDBG_STDIN].fd)) {

char buf[PHPDBG_MAX_CMD];

phpdbg_consume_stdin_line(buf);

buffer = estrdup(buf);

} else

index b329bda..4dde04a 100644

@@ -159,7 +159,7 @@ PHPDBG_INFO(constants) /* {{{ */

return SUCCESS;

} /* }}} */

zend_auto_global *auto_global = Z_PTR_P(ptrzv);

if (auto_global->armed) {

index 261a67c..d614628 100644

+----------------------------------------------------------------------+

*/

#ifdef HAVE_CONFIG_H

#include <config.h>

#endif

ZEND_EXTERN_MODULE_GLOBALS(phpdbg)

}