-
Notifications
You must be signed in to change notification settings - Fork 7.9k
IMAP: Fix UNKNOWN default values #6179
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
AppVeyor build fails:
|
181d36c
to
7e0ab1c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Assuming the build is happy, this looks good to me.
@@ -2678,7 +2677,7 @@ PHP_FUNCTION(imap_sort) | |||
mypgm->function = (short) pgm; | |||
mypgm->next = NIL; | |||
|
|||
slst = mail_sort(imap_le_struct->imap_stream, (argc == 6 ? ZSTR_VAL(charset) : NIL), spg, mypgm, (argc >= 4 ? flags : NIL)); | |||
slst = mail_sort(imap_le_struct->imap_stream, (charset ? ZSTR_VAL(charset) : NIL), spg, mypgm, (argc >= 4 ? flags : NIL)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
slst = mail_sort(imap_le_struct->imap_stream, (charset ? ZSTR_VAL(charset) : NIL), spg, mypgm, (argc >= 4 ? flags : NIL)); | |
slst = mail_sort(imap_le_struct->imap_stream, (charset ? ZSTR_VAL(charset) : NIL), spg, mypgm, flags; |
to remove argc dependency. NIL is defined as 0.
… function signature > The unused default_host argument of imap_headerinfo() has been removed. Refs: * https://github.com/php/php-src/blob/0a84fba0deb1c1b75770a436c4236dc56e6d0463/UPGRADING#L332 * php/php-src#6179 * php/php-src@5d7d5e2
> The imap_header() function which is an alias of imap_headerinfo() has been removed. Refs: * https://github.com/php/php-src/blob/0a84fba0deb1c1b75770a436c4236dc56e6d0463/UPGRADING#L332 * php/php-src#6179 * php/php-src@5d7d5e2
A went and did a bit of refactoring at the same time to make this easier to implement.