mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-07-13 11:55:36 +08:00
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
|
|
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
|
||
|
|
index 3959b362..6cdfbd39 100644
|
||
|
|
--- a/ext/libxml/libxml.c
|
||
|
|
+++ b/ext/libxml/libxml.c
|
||
|
|
@@ -483,7 +483,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;
|
||
|
|
@@ -736,7 +740,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);
|
||
|
|
|
||
|
|
@@ -1009,11 +1017,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 651eab23..7a7ce304 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);
|