com php-src: Merge branch 'PHP-7.1' into PHP-7.2: ext/mysqli/mysqli.c ext/mysqli/mysqli_api.c win32/sendmail.c

Commit: 8d5a5fbf6b2504cb1589d1fc9031f89c057ca871 Author: Joe Watkins <krakjoe@php.net> Tue, 25 Jul 2017 06:54:20 +0100 Parents: 2e8759428b83bd499c4b4571e62c3fb663e18dd6 78ad5e8864feec55e3aecfd96b369a62ffb953ee Branches: PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8d5a5fbf6b2504cb1589d1fc9031f89c057ca871 Log: Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: minor loop optimizations, closes #2633 Bugs: https://bugs.php.net/2633 Changed paths: MM ext/mysqli/mysqli.c MM ext/mysqli/mysqli_api.c MM win32/sendmail.c Diff: diff --cc win32/sendmail.c index c71ab22,808fc8f..62d7105 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@@ -677,8 -698,15 +677,12 @@@ static int PostHeader(char *RPath, cha size_t i; if (xheaders) { + size_t headers_lc_len; + - if (NULL == (headers_lc = estrdup(xheaders))) { - return OUT_OF_MEMORY; - } - + headers_lc = estrdup(xheaders); - for (i = 0; i < strlen(headers_lc); i++) { + headers_lc_len = strlen(headers_lc); + + for (i = 0; i < headers_lc_len; i++) { headers_lc[i] = tolower(headers_lc[i]); } }