Make libxml stream context externally visible and use it in html_document

Author: nielsdos

ext/dom/html_document.c

@@ -715,9 +715,8 @@ PHP_METHOD(DOM_HTMLDocument, createFromFile)
 		dom_setup_parser_encoding_manually((const lxb_char_t *) buf, encoding_data, &decoding_encoding_ctx, &application_data);
 	}
 
-	// TODO: context from LIBXML(stream_context) ???
 	// TODO: https://mimesniff.spec.whatwg.org/#parsing-a-mime-type
-	stream = php_stream_open_wrapper_ex(filename, "rb", REPORT_ERRORS, /* opened_path */ NULL, /* context */ NULL);
+	stream = php_stream_open_wrapper_ex(filename, "rb", REPORT_ERRORS, /* opened_path */ NULL, /* context */ php_libxml_get_stream_context());
 	if (!stream) {
 		if (!EG(exception)) {
 			zend_throw_exception_ex(NULL, 0, "Cannot open file '%s'", filename);

ext/libxml/libxml.c

@@ -369,6 +369,11 @@ static PHP_GINIT_FUNCTION(libxml)
 	libxml_globals->entity_loader_callback = empty_fcall_info_cache;
 }
 
+PHP_LIBXML_API php_stream_context *php_libxml_get_stream_context(void)
+{
+	return php_stream_context_from_zval(Z_ISUNDEF(LIBXML(stream_context)) ? NULL : &LIBXML(stream_context), false);
+}
+
 /* Channel libxml file io layer through the PHP streams subsystem.
  * This allows use of ftps:// and https:// urls */
 
@@ -436,7 +441,7 @@ static void *php_libxml_streams_IO_open_wrapper(const char *filename, const char
 		}
 	}
 
-	context = php_stream_context_from_zval(Z_ISUNDEF(LIBXML(stream_context))? NULL : &LIBXML(stream_context), 0);
+	context = php_libxml_get_stream_context();
 
 	ret_val = php_stream_open_wrapper_ex(path_to_open, (char *)mode, REPORT_ERRORS, NULL, context);
 	if (ret_val) {

ext/libxml/php_libxml.h

@@ -139,6 +139,7 @@ PHP_LIBXML_API void php_libxml_switch_context(zval *context, zval *oldcontext);
 PHP_LIBXML_API void php_libxml_issue_error(int level, const char *msg);
 PHP_LIBXML_API bool php_libxml_disable_entity_loader(bool disable);
 PHP_LIBXML_API void php_libxml_set_old_ns(xmlDocPtr doc, xmlNsPtr ns);
+PHP_LIBXML_API php_stream_context *php_libxml_get_stream_context(void);
 
 /* Init/shutdown functions*/
 PHP_LIBXML_API void php_libxml_initialize(void);