[php-src] master: ext/soap: remove parameter of soap_server_fault_en() that are always NULL
Gina Peter Banyard <[email protected]>
| Newsgroups | gmane.comp.php.cvs.general |
|---|---|
| Message-ID | <[email protected]> |
Author: Gina Peter Banyard (Girgias)
Date: 2026-07-03T11:28:29+01:00
Commit: https://github.com/php/php-src/commit/56d41ff03471266d080f41de6b21dc6bcedf3187
Raw diff: https://github.com/php/php-src/commit/56d41ff03471266d080f41de6b21dc6bcedf3187.diff
ext/soap: remove parameter of soap_server_fault_en() that are always NULL
Changed paths:
M ext/soap/soap.c
Diff:
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 9f14168fa79b..12a72301249d 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -54,7 +54,7 @@ static void add_soap_fault_ex(zval *fault, zval *obj, const char *fault_code, co
static void add_soap_fault_ex_en(zval *fault, zval *obj, const char *fault_code, const char *fault_string);
static ZEND_NORETURN void soap_server_fault(const char *code, const char *string, const char *actor, zval* details, zend_string *name, zend_string *lang);
static void soap_server_fault_ex(sdlFunctionPtr function, zval* fault, soapHeader* hdr);
-static ZEND_NORETURN void soap_server_fault_en(const char *code, const char *string, const char *actor, zval* details, zend_string *name);
+static ZEND_NORETURN void soap_server_fault_en(const char *code, const char *string);
static sdlParamPtr get_param(sdlFunctionPtr function, const char *param_name, zend_ulong index, int);
static sdlFunctionPtr get_function(sdlPtr sdl, const char *function_name, size_t function_name_length);
@@ -1328,7 +1328,7 @@ PHP_METHOD(SoapServer, handle)
SOAP_GLOBAL(soap_version) = service->version;
if (arg && ZEND_SIZE_T_INT_OVFL(arg_len)) {
- soap_server_fault_en("Server", "Input string is too long", NULL, NULL, NULL);
+ soap_server_fault_en("Server", "Input string is too long");
SOAP_SERVER_END_CODE();
return;
}
@@ -1354,13 +1354,13 @@ PHP_METHOD(SoapServer, handle)
php_stream_passthru(stream);
php_stream_close(stream);
} else {
- soap_server_fault_en("Server", "Couldn't find WSDL", NULL, NULL, NULL);
+ soap_server_fault_en("Server", "Couldn't find WSDL");
}
SOAP_SERVER_END_CODE();
return;
} else {
- soap_server_fault_en("Server", "WSDL generation is not supported yet", NULL, NULL, NULL);
+ soap_server_fault_en("Server", "WSDL generation is not supported yet");
/*
sapi_add_header("Content-Type: text/xml; charset=utf-8", sizeof("Content-Type: text/xml; charset=utf-8"), 1);
PUTS("<?xml version=\"1.0\" ?>\n<definitions\n");
@@ -1433,7 +1433,7 @@ PHP_METHOD(SoapServer, handle)
}
if (doc_request == NULL) {
- soap_server_fault_en("Client", "Bad Request", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "Bad Request");
}
if (xmlGetIntSubset(doc_request) != NULL) {
xmlNodePtr env = get_node(doc_request->children,"Envelope");
@@ -1445,7 +1445,7 @@ PHP_METHOD(SoapServer, handle)
}
}
xmlFreeDoc(doc_request);
- soap_server_fault_en("Server", "DTD are not supported by SOAP", NULL, NULL, NULL);
+ soap_server_fault_en("Server", "DTD are not supported by SOAP");
}
old_sdl = SOAP_GLOBAL(sdl);
@@ -1503,7 +1503,7 @@ PHP_METHOD(SoapServer, handle)
soap_obj = tmp_soap_p;
} else if (Z_OBJCE_P(tmp_soap_p) == php_ce_incomplete_class) {
/* See #51561, communicate limitation to user */
- soap_server_fault_en("Server", "SoapServer class was deserialized from the session prior to loading the class passed to SoapServer::setClass(). Start the session after loading all classes to resolve this issue.", NULL, NULL, NULL);
+ soap_server_fault_en("Server", "SoapServer class was deserialized from the session prior to loading the class passed to SoapServer::setClass(). Start the session after loading all classes to resolve this issue.");
}
}
}
@@ -1562,7 +1562,7 @@ PHP_METHOD(SoapServer, handle)
#if 0
if (service->sdl && !h->function && !h->hdr) {
if (h->mustUnderstand) {
- soap_server_fault_en("MustUnderstand","Header not understood", NULL, NULL, NULL);
+ soap_server_fault_en("MustUnderstand","Header not understood");
} else {
continue;
}
@@ -1601,7 +1601,7 @@ PHP_METHOD(SoapServer, handle)
goto fail;
}
} else if (h->mustUnderstand) {
- soap_server_fault_en("MustUnderstand","Header not understood", NULL, NULL, NULL);
+ soap_server_fault_en("MustUnderstand","Header not understood");
}
}
}
@@ -1887,9 +1887,9 @@ static ZEND_NORETURN void soap_server_fault(const char *code, const char *string
}
/* }}} */
-static ZEND_NORETURN void soap_server_fault_en(const char *code, const char *string, const char *actor, zval* details, zend_string* name)
+static ZEND_NORETURN void soap_server_fault_en(const char *code, const char *string)
{
- soap_server_fault(code, string, actor, details, name, soap_lang_en);
+ soap_server_fault(code, string, NULL, NULL, NULL, soap_lang_en);
}
static zend_never_inline ZEND_COLD void soap_real_error_handler(int error_num, zend_string *error_filename, const uint32_t error_lineno, zend_string *message) /* {{{ */
@@ -3109,7 +3109,7 @@ static void deserialize_parameters(xmlNodePtr params, sdlFunctionPtr function, u
sdlParamPtr param = NULL;
if (function != NULL &&
(param = zend_hash_index_find_ptr(function->requestParameters, cur_param)) == NULL) {
- soap_server_fault_en("Client", "Error cannot find parameter", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "Error cannot find parameter");
}
if (param == NULL) {
enc = NULL;
@@ -3124,7 +3124,7 @@ static void deserialize_parameters(xmlNodePtr params, sdlFunctionPtr function, u
}
}
if (num_of_params > cur_param) {
- soap_server_fault_en("Client","Missing parameter", NULL, NULL, NULL);
+ soap_server_fault_en("Client","Missing parameter");
}
(*parameters) = tmp_parameters;
(*num_params) = num_of_params;
@@ -3215,7 +3215,7 @@ static xmlNodePtr get_envelope(xmlNodePtr trav, int *version, char **envelope_ns
return trav;
}
- soap_server_fault_en("VersionMismatch", "Wrong Version", NULL, NULL, NULL);
+ soap_server_fault_en("VersionMismatch", "Wrong Version");
}
trav = trav->next;
}
@@ -3235,18 +3235,18 @@ static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, c
/* Get <Envelope> element */
env = get_envelope(request->children, version, &envelope_ns);
if (!env) {
- soap_server_fault_en("Client", "looks like we got XML without \"Envelope\" element", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "looks like we got XML without \"Envelope\" element");
}
attr = env->properties;
while (attr != NULL) {
if (attr->ns == NULL) {
- soap_server_fault_en("Client", "A SOAP Envelope element cannot have non Namespace qualified attributes", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "A SOAP Envelope element cannot have non Namespace qualified attributes");
} else if (attr_is_equal_ex(attr,"encodingStyle",SOAP_1_2_ENV_NAMESPACE)) {
if (*version == SOAP_1_2) {
- soap_server_fault_en("Client", "encodingStyle cannot be specified on the Envelope", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "encodingStyle cannot be specified on the Envelope");
} else if (strcmp((char*)attr->children->content,SOAP_1_1_ENC_NAMESPACE) != 0) {
- soap_server_fault_en("Client", "Unknown data encoding style", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "Unknown data encoding style");
}
}
attr = attr->next;
@@ -3276,26 +3276,26 @@ static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, c
trav = trav->next;
}
if (body == NULL) {
- soap_server_fault_en("Client", "Body must be present in a SOAP envelope", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "Body must be present in a SOAP envelope");
}
attr = body->properties;
while (attr != NULL) {
if (attr->ns == NULL) {
if (*version == SOAP_1_2) {
- soap_server_fault_en("Client", "A SOAP Body element cannot have non Namespace qualified attributes", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "A SOAP Body element cannot have non Namespace qualified attributes");
}
} else if (attr_is_equal_ex(attr,"encodingStyle",SOAP_1_2_ENV_NAMESPACE)) {
if (*version == SOAP_1_2) {
- soap_server_fault_en("Client", "encodingStyle cannot be specified on the Body", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "encodingStyle cannot be specified on the Body");
} else if (strcmp((char*)attr->children->content,SOAP_1_1_ENC_NAMESPACE) != 0) {
- soap_server_fault_en("Client", "Unknown data encoding style", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "Unknown data encoding style");
}
}
attr = attr->next;
}
if (trav != NULL && *version == SOAP_1_2) {
- soap_server_fault_en("Client", "A SOAP 1.2 envelope can contain only Header and Body", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "A SOAP 1.2 envelope can contain only Header and Body");
}
func = NULL;
@@ -3304,7 +3304,7 @@ static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, c
if (trav->type == XML_ELEMENT_NODE) {
/*
if (func != NULL) {
- soap_server_fault_en("Client", "looks like we got \"Body\" with several functions call", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "looks like we got \"Body\" with several functions call");
}
*/
func = trav;
@@ -3321,19 +3321,19 @@ static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, c
if (function) {
ZVAL_STRING(function_name, (char *)function->functionName);
} else {
- soap_server_fault_en("Client", "looks like we got \"Body\" without function call", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "looks like we got \"Body\" without function call");
}
}
} else {
if (*version == SOAP_1_1) {
attr = get_attribute_ex(func->properties,"encodingStyle",SOAP_1_1_ENV_NAMESPACE);
if (attr && strcmp((char*)attr->children->content,SOAP_1_1_ENC_NAMESPACE) != 0) {
- soap_server_fault_en("Client","Unknown Data Encoding Style", NULL, NULL, NULL);
+ soap_server_fault_en("Client","Unknown Data Encoding Style");
}
} else {
attr = get_attribute_ex(func->properties,"encodingStyle",SOAP_1_2_ENV_NAMESPACE);
if (attr && strcmp((char*)attr->children->content,SOAP_1_2_ENC_NAMESPACE) != 0) {
- soap_server_fault_en("DataEncodingUnknown","Unknown Data Encoding Style", NULL, NULL, NULL);
+ soap_server_fault_en("DataEncodingUnknown","Unknown Data Encoding Style");
}
}
if (!function) {
@@ -3341,7 +3341,7 @@ static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, c
}
if (sdl != NULL && function == NULL) {
if (*version == SOAP_1_2) {
- soap_server_fault_en("rpc:ProcedureNotPresent","Procedure not present", NULL, NULL, NULL);
+ soap_server_fault_en("rpc:ProcedureNotPresent","Procedure not present");
} else {
php_error(E_ERROR, "Procedure '%s' not present", func->name);
}
@@ -3355,12 +3355,12 @@ static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, c
attr = head->properties;
while (attr != NULL) {
if (attr->ns == NULL) {
- soap_server_fault_en("Client", "A SOAP Header element cannot have non Namespace qualified attributes", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "A SOAP Header element cannot have non Namespace qualified attributes");
} else if (attr_is_equal_ex(attr,"encodingStyle",SOAP_1_2_ENV_NAMESPACE)) {
if (*version == SOAP_1_2) {
- soap_server_fault_en("Client", "encodingStyle cannot be specified on the Header", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "encodingStyle cannot be specified on the Header");
} else if (strcmp((char*)attr->children->content,SOAP_1_1_ENC_NAMESPACE) != 0) {
- soap_server_fault_en("Client", "Unknown data encoding style", NULL, NULL, NULL);
+ soap_server_fault_en("Client", "Unknown data encoding style");
}
}
attr = attr->next;
@@ -3374,7 +3374,7 @@ static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, c
if (*version == SOAP_1_1) {
attr = get_attribute_ex(hdr_func->properties,"encodingStyle",SOAP_1_1_ENV_NAMESPACE);
if (attr && strcmp((char*)attr->children->content,SOAP_1_1_ENC_NAMESPACE) != 0) {
- soap_server_fault_en("Client","Unknown Data Encoding Style", NULL, NULL, NULL);
+ soap_server_fault_en("Client","Unknown Data Encoding Style");
}
attr = get_attribute_ex(hdr_func->properties,"actor",envelope_ns);
if (attr != NULL) {
@@ -3386,7 +3386,7 @@ static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, c
} else if (*version == SOAP_1_2) {
attr = get_attribute_ex(hdr_func->properties,"encodingStyle",SOAP_1_2_ENV_NAMESPACE);
if (attr && strcmp((char*)attr->children->content,SOAP_1_2_ENC_NAMESPACE) != 0) {
- soap_server_fault_en("DataEncodingUnknown","Unknown Data Encoding Style", NULL, NULL, NULL);
+ soap_server_fault_en("DataEncodingUnknown","Unknown Data Encoding Style");
}
attr = get_attribute_ex(hdr_func->properties,"role",envelope_ns);
if (attr != NULL) {
@@ -3406,7 +3406,7 @@ static sdlFunctionPtr deserialize_function_call(sdlPtr sdl, xmlDocPtr request, c
strcmp((char*)attr->children->content,"false") == 0) {
mustUnderstand = 0;
} else {
- soap_server_fault_en("Client","mustUnderstand value is not boolean", NULL, NULL, NULL);
+ soap_server_fault_en("Client","mustUnderstand value is not boolean");
}
}
h = emalloc(sizeof(soapHeader));
@@ -3635,7 +3635,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, const char *fu
ns = xmlNewNs(envelope, BAD_CAST(SOAP_1_2_ENV_NAMESPACE), BAD_CAST(SOAP_1_2_ENV_NS_PREFIX));
xmlSetNs(envelope,ns);
} else {
- soap_server_fault_en("Server", "Unknown SOAP version", NULL, NULL, NULL);
+ soap_server_fault_en("Server", "Unknown SOAP version");
}
xmlDocSetRootElement(doc, envelope);