Fix for #8359. imap_fetchheader should never return the full message; the

FT_PREFETCHTEXT flag is just a hint to c-client that you'll be asking for
the message text next.
This commit is contained in:
Chuck Hagenbuch 2001-05-03 19:18:48 +00:00
parent cbb777f167
commit 5c0791fcac

View File

@ -2808,17 +2808,7 @@ PHP_FUNCTION(imap_fetchheader)
RETURN_FALSE;
}
if ((myargc == 3) && (Z_LVAL_PP(flags) & FT_PREFETCHTEXT)) {
header = mail_fetchheader_full(imap_le_struct->imap_stream, Z_LVAL_PP(msgno), NIL, &hlen, Z_LVAL_PP(flags));
body = mail_fetchtext_full(imap_le_struct->imap_stream, Z_LVAL_PP(msgno), &blen, Z_LVAL_PP(flags));
tempstring = emalloc(hlen+blen+1);
strcpy(tempstring,header);
strcat(tempstring,body);
RETVAL_STRINGL(tempstring,(hlen+blen+1),1);
efree(tempstring);
} else {
RETVAL_STRING(mail_fetchheader_full(imap_le_struct->imap_stream, Z_LVAL_PP(msgno), NIL, NIL, (myargc == 3 ? Z_LVAL_PP(flags) : NIL)), 1);
}
RETVAL_STRING(mail_fetchheader_full(imap_le_struct->imap_stream, Z_LVAL_PP(msgno), NIL, NIL, (myargc == 3 ? Z_LVAL_PP(flags) : NIL)), 1);
}
/* }}} */