ext/standard/mail: Various refactorings (part 1) #20782
Open
+59
−80
Conversation
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
In preparation for php_mail() refactoring
Fix incorrect return type Use zend_string macros
The branching logic is already defined in the function
Change paremeter type to be zend_string* rather than assuming the zval IS_STRING Use zend_string macros Add const qualifier Use for loop
Girgias
requested review from
alexdowad,
bukka and
youkidearitai
as code owners
ndossche
requested changes
Dec 26, 2025
| PHP_RSHUTDOWN_FUNCTION(user_filters); | ||
| PHP_RSHUTDOWN_FUNCTION(browscap); | ||
|
|
||
| /* Left for BC (not binary safe!) */ |
Member
There was a problem hiding this comment.
Is this comment still accurate now?
|
|
||
| if (PG(mail_x_header)) { | ||
| const char *tmp = zend_get_executed_filename(); | ||
| const zend_string *tmp = zend_get_executed_filename_ex(); |
Member
There was a problem hiding this comment.
This is not equivalent because zend_get_executed_filename cannot return NULL while zend_get_executed_filename_ex can
| } | ||
|
|
||
|
|
||
| #define MAIL_RET(val) \ |
Member
There was a problem hiding this comment.
I'm not sure this code motion is important/useful.
| while (len < value->len) { | ||
| if (*(value->val+len) == '\r') { | ||
| if (*(value->val+len+1) != '\n') { | ||
| for (size_t len = 0; len < ZSTR_LEN(value); len++) { |
Member
There was a problem hiding this comment.
This change is wrong.
Now you always increment len, even if the "continue" is hit. So the following code block:
len += 3;
continue;will now increment by 4 instead of 3.
| . _php_error_log() now has a formal return type of zend_result. | ||
| . _php_error_log() now accepts zend_string* values instead of char*. | ||
| . _php_error_log_ex() has been removed. | ||
| . php_mail()'s extra_cmd parameter is now a zend_string*. |
Member
There was a problem hiding this comment.
I'm not sure what this change accomplishes concretely
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Commits should be reviewed in order
Part 1 of various refactoring relating to
php_mail(), the main objective is to get rid of various strlen() recomputations when we already know the length of the strings.