diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-09-30 08:37:35 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-09-30 08:37:35 +0300 |
| commit | 2a0e4b88fdeb599673220ca39499337123aa5514 (patch) | |
| tree | 90ed1cbc3234c73960b9074ff867e8fcfa9bc7d6 /ext/soap | |
| parent | 6f0b2326482c2c3cc937bbc8c061fd1d3783bd31 (diff) | |
| parent | 161636385057fdf7bc23539fc1714fc9c1526fa1 (diff) | |
| download | php-git-2a0e4b88fdeb599673220ca39499337123aa5514.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed incorrect error message
Diffstat (limited to 'ext/soap')
| -rw-r--r-- | ext/soap/php_schema.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c index 33793704ad..02d2629c55 100644 --- a/ext/soap/php_schema.c +++ b/ext/soap/php_schema.c @@ -1614,8 +1614,6 @@ static int schema_element(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr element, sdlTyp attr = get_attribute(attrs, "default"); if (attr) { if (ref != NULL) { - soap_error0(E_ERROR, "Parsing Schema: element has both 'ref' and 'fixed' attributes"); - } else if (ref != NULL) { soap_error0(E_ERROR, "Parsing Schema: element has both 'default' and 'fixed' attributes"); } cur_type->def = estrdup((char*)attr->children->content); |