MFH: fixed #35253 length of the encoded string vilolates a RFC.

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index d7426af3598b8c00224175a97ca4f3618224317e..dd542ca69dab54482c2deca74e4732aa65d81b06 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2294,7 +2294,7 @@ PHP_FUNCTION(mb_list_encodings)
 }
 /* }}} */
 
-/* {{{ proto string mb_encode_mimeheader(string str [, string charset [, string transfer-encoding [, string linefeed]]])
+/* {{{ proto string mb_encode_mimeheader(string str [, string charset [, string transfer-encoding [, string linefeed [, int indent]]]])
    Converts the string to MIME "encoded-word" in the format of =?charset?(B|Q)?encoded_string?= */
 PHP_FUNCTION(mb_encode_mimeheader)
 {
@@ -2306,12 +2306,13 @@ PHP_FUNCTION(mb_encode_mimeheader)
        int trans_enc_name_len;
        char *linefeed = "\r\n";
        int linefeed_len;
+       int indent = 0;
 
        mbfl_string_init(&string);
        string.no_language = MBSTRG(current_language);
        string.no_encoding = MBSTRG(current_internal_encoding);
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|sss", (char **)&string.val, &string.len, &charset_name, &charset_name_len, &trans_enc_name, &trans_enc_name_len, &linefeed, &linefeed_len) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|sss", (char **)&string.val, &string.len, &charset_name, &charset_name_len, &trans_enc_name, &trans_enc_name_len, &linefeed, &linefeed_len, &indent) == FAILURE) {
                return;
        }
 
@@ -2341,7 +2342,7 @@ PHP_FUNCTION(mb_encode_mimeheader)
        }
 
        mbfl_string_init(&result);
-       ret = mbfl_mime_header_encode(&string, &result, charset, transenc, linefeed, 0);
+       ret = mbfl_mime_header_encode(&string, &result, charset, transenc, linefeed, indent);
        if (ret != NULL) {
                RETVAL_STRINGL((char *)ret->val, ret->len, 0)   /* the string is already strdup()'ed */
        } else {