[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mbstring mbstring.c

[Rui Hirokawa]

hirokawa                Sat Nov 19 03:25:34 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/mbstring       mbstring.c 
  Log:
  MFH: fixed #35253 length of the encoded string vilolates a RFC.
  
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.224.2.2&r2=1.224.2.3&ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.2 
php-src/ext/mbstring/mbstring.c:1.224.2.3
--- php-src/ext/mbstring/mbstring.c:1.224.2.2   Wed Sep 21 09:23:00 2005
+++ php-src/ext/mbstring/mbstring.c     Sat Nov 19 03:25:32 2005
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: mbstring.c,v 1.224.2.2 2005/09/21 13:23:00 iliaa Exp $ */
+/* $Id: mbstring.c,v 1.224.2.3 2005/11/19 08:25:32 hirokawa Exp $ */
 
 /*
  * PHP 4 Multibyte String module "mbstring"
@@ -2294,7 +2294,7 @@
 }
 /* }}} */
 
-/* {{{ 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 @@
        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 @@
        }
 
        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 {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php