From 5c0791fcacfd043f8362aff1400d4e3629b43fda Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Thu, 3 May 2001 19:18:48 +0000 Subject: 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. --- ext/imap/php_imap.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'ext/imap/php_imap.c') diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 649406a560..d81de05344 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -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); } /* }}} */ -- cgit v1.2.1