cvs: php-src /ext/imap php_imap.c

iliaa Thu Aug 12 15:20:15 2004 EDT Modified files: /php-src/ext/imap php_imap.c Log: Properly fix the msgno check inside imap_fetchbody(). http://cvs.php.net/diff.php/php-src/ext/imap/php_imap.c?r1=1.186&r2=1.187&ty=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.186 php-src/ext/imap/php_imap.c:1.187 --- php-src/ext/imap/php_imap.c:1.186 Thu Aug 12 14:01:45 2004 +++ php-src/ext/imap/php_imap.c Thu Aug 12 15:20:15 2004 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.186 2004/08/12 18:01:45 chagenbu Exp $ */ +/* $Id: php_imap.c,v 1.187 2004/08/12 19:20:15 iliaa Exp $ */ #define IMAP41 @@ -1817,11 +1817,11 @@ convert_to_long_ex(flags); } - if (myargc < 4 || !Z_LVAL_PP(flags) & FT_UID) { - /* If we're fetching via UID, checking the range of msgno is - DUMB. */ - PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno)); - } + if (myargc < 4 || !(Z_LVAL_PP(flags) & FT_UID)) { + /* only perform the check if the msgno is a message number and not a UID */ + PHP_IMAP_CHECK_MSGNO(Z_LVAL_PP(msgno)); + } + body = mail_fetchbody_full(imap_le_struct->imap_stream, Z_LVAL_PP(msgno), Z_STRVAL_PP(sec), &len, myargc==4 ? Z_LVAL_PP(flags) : NIL);