[Bug] 73538 - Fix __setSoapHeaders() with array#2212
Closed
duncan3dc wants to merge 2 commits intophp:PHP-7.0from
Closed
[Bug] 73538 - Fix __setSoapHeaders() with array#2212duncan3dc wants to merge 2 commits intophp:PHP-7.0from
duncan3dc wants to merge 2 commits intophp:PHP-7.0from
Conversation
Member
|
cc @dstogov as he is the soap guy (usually!) |
|
Comment on behalf of krakjoe at php.net: labelling |
nikic
reviewed
Nov 20, 2016
ext/soap/soap.c
Outdated
| } else if (Z_TYPE_P(headers) == IS_ARRAY) { | ||
| zval *default_headers; | ||
|
|
||
| zend_hash_str_del(Z_OBJPROP_P(this_ptr), "__default_headers", sizeof("__default_headers")-1); |
Member
There was a problem hiding this comment.
This line shouldn't be necessary.
Member
Author
There was a problem hiding this comment.
Thanks, I assumed we needed to remove the property before attempting to add one with the same name. I'll remove this line now
Member
|
Merged via 685b129, thanks! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Added a test for the bug 73538 and also attempted a fix.
The docs say that any call to
__setSoapHeaders()will "replace any previous values", so I changed the code to remove the headers, and then add the passed in ones