archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-8.0'

Browse source 
* PHP-8.0:
  Clarify that location is required in do_request
  Regenerate arginfo file
This commit is contained in:
Nikita Popov 2021-02-10 11:19:15 +01:00
commit 35b2426e21
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/soap/soap.c
View file

@ -2215,11 +2215,7 @@ static int do_request(zval *this_ptr, xmlDoc *request, char *location, char *act
ZVAL_STRINGL(&func,"__doRequest",sizeof("__doRequest")-1); ZVAL_STRINGL(&func,"__doRequest",sizeof("__doRequest")-1);
ZVAL_STRINGL(&params[0], buf, buf_size); ZVAL_STRINGL(&params[0], buf, buf_size);
if (location == NULL) { ZVAL_STRING(&params[1], location);
ZVAL_NULL(&params[1]);
} else {
ZVAL_STRING(&params[1], location);
}
if (action == NULL) { if (action == NULL) {
ZVAL_NULL(&params[2]); ZVAL_NULL(&params[2]);
} else { } else {
@ -2371,6 +2367,7 @@ static void do_soap_call(zend_execute_data *execute_data,
if (location == NULL) { if (location == NULL) {
location = binding->location; location = binding->location;
ZEND_ASSERT(location);
} }
if (binding->bindingType == BINDING_SOAP) { if (binding->bindingType == BINDING_SOAP) {
sdlSoapBindingFunctionPtr fnb = (sdlSoapBindingFunctionPtr)fn->bindingAttributes; sdlSoapBindingFunctionPtr fnb = (sdlSoapBindingFunctionPtr)fn->bindingAttributes;

4
ext/soap/soap_arginfo.h
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead. /* This is a generated file, edit the .stub.php file instead.
* Stub hash: b22d29a51c17d627763229aac15718702002daec */ * Stub hash: c0d32b2d8f3c39203b437a01dc79cd4e934dc9f7 */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_use_soap_error_handler, 0, 0, _IS_BOOL, 0) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_use_soap_error_handler, 0, 0, _IS_BOOL, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enable, _IS_BOOL, 0, "true") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enable, _IS_BOOL, 0, "true")
@ -131,7 +131,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___setSoapHeaders, 0, 0, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___setLocation, 0, 0, 0) ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SoapClient___setLocation, 0, 0, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, location, IS_STRING, 0, "\"\"") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, location, IS_STRING, 1, "null")
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()