mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-31 00:12:05 +01:00
68 lines
2.3 KiB
Diff
68 lines
2.3 KiB
Diff
Patch-Source: https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082
|
|
From 0a39890c967aa57225bb6bdf4821aff7a3a3c082 Mon Sep 17 00:00:00 2001
|
|
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
|
|
Date: Fri, 1 Dec 2023 18:03:35 +0100
|
|
Subject: [PATCH] Fix libxml2 2.12 build due to API breaks
|
|
|
|
See https://github.com/php/php-src/actions/runs/7062192818/job/19225478601
|
|
---
|
|
ext/libxml/libxml.c | 14 ++++++++++----
|
|
ext/soap/php_sdl.c | 2 +-
|
|
2 files changed, 11 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
|
|
index 22eb1901b8909..1de693892b7aa 100644
|
|
--- a/ext/libxml/libxml.c
|
|
+++ b/ext/libxml/libxml.c
|
|
@@ -472,7 +472,11 @@ static void _php_libxml_free_error(void *ptr)
|
|
xmlResetError((xmlErrorPtr) ptr);
|
|
}
|
|
|
|
-static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg)
|
|
+#if LIBXML_VERSION >= 21200
|
|
+static void _php_list_set_error_structure(const xmlError *error, const char *msg)
|
|
+#else
|
|
+static void _php_list_set_error_structure(xmlError *error, const char *msg)
|
|
+#endif
|
|
{
|
|
xmlError error_copy;
|
|
int ret;
|
|
@@ -725,7 +729,11 @@ PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...)
|
|
va_end(args);
|
|
}
|
|
|
|
+#if LIBXML_VERSION >= 21200
|
|
+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error)
|
|
+#else
|
|
PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error)
|
|
+#endif
|
|
{
|
|
_php_list_set_error_structure(error, NULL);
|
|
|
|
@@ -957,11 +965,9 @@ PHP_FUNCTION(libxml_use_internal_errors)
|
|
/* {{{ Retrieve last error from libxml */
|
|
PHP_FUNCTION(libxml_get_last_error)
|
|
{
|
|
- xmlErrorPtr error;
|
|
-
|
|
ZEND_PARSE_PARAMETERS_NONE();
|
|
|
|
- error = xmlGetLastError();
|
|
+ const xmlError *error = xmlGetLastError();
|
|
|
|
if (error) {
|
|
object_init_ex(return_value, libxmlerror_class_entry);
|
|
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
|
|
index 749f5a5685ec2..b731114775ad7 100644
|
|
--- a/ext/soap/php_sdl.c
|
|
+++ b/ext/soap/php_sdl.c
|
|
@@ -332,7 +332,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include)
|
|
sdl_restore_uri_credentials(ctx);
|
|
|
|
if (!wsdl) {
|
|
- xmlErrorPtr xmlErrorPtr = xmlGetLastError();
|
|
+ const xmlError *xmlErrorPtr = xmlGetLastError();
|
|
|
|
if (xmlErrorPtr) {
|
|
soap_error2(E_ERROR, "Parsing WSDL: Couldn't load from '%s' : %s", struri, xmlErrorPtr->message);
|