cvs: php4 /ext/imap php_imap.c

sniper Wed Jun 26 19:28:32 2002 EDT Modified files: /php4/ext/imap php_imap.c Log: - Fixed bug: #17999 - The errors should always be stored, but they are not supposed to be shown at request shutdown unless E_NOTICES are allowed. Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.118 php4/ext/imap/php_imap.c:1.119 --- php4/ext/imap/php_imap.c:1.118 Sun Jun 23 18:44:29 2002 +++ php4/ext/imap/php_imap.c Wed Jun 26 19:28:31 2002 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.118 2002/06/23 22:44:29 sterling Exp $ */ +/* $Id: php_imap.c,v 1.119 2002/06/26 23:28:31 sniper Exp $ */ #define IMAP41 @@ -633,20 +633,24 @@ if (IMAPG(imap_errorstack) != NIL) { /* output any remaining errors at their original error level */ - ecur = IMAPG(imap_errorstack); - while (ecur != NIL) { - php_error(E_NOTICE, "%s (errflg=%d)", ecur->LTEXT, ecur->errflg); - ecur = ecur->next; + if (EG(error_reporting) & E_NOTICE) { + ecur = IMAPG(imap_errorstack); + while (ecur != NIL) { + php_error(E_NOTICE, "%s (errflg=%d)", ecur->LTEXT, ecur->errflg); + ecur = ecur->next; + } } mail_free_errorlist(&IMAPG(imap_errorstack)); } if (IMAPG(imap_alertstack) != NIL) { /* output any remaining alerts at E_NOTICE level */ - acur = IMAPG(imap_alertstack); - while (acur != NIL) { - php_error(E_NOTICE, acur->LTEXT); - acur = acur->next; + if (EG(error_reporting) & E_NOTICE) { + acur = IMAPG(imap_alertstack); + while (acur != NIL) { + php_error(E_NOTICE, acur->LTEXT); + acur = acur->next; + } } mail_free_stringlist(&IMAPG(imap_alertstack)); IMAPG(imap_alertstack) = NIL; @@ -4088,9 +4092,6 @@ TSRMLS_FETCH(); /* Author: CJH */ - if (!(EG(error_reporting) & E_NOTICE)) { - return; - } if (errflg != NIL) { /* CJH: maybe put these into a more comprehensive log for debugging purposes? */ if (IMAPG(imap_errorstack) == NIL) { IMAPG(imap_errorstack) = mail_newerrorlist();