diff options
| author | Andrey Hristov <andrey@php.net> | 2013-07-08 20:28:51 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-07-08 20:28:51 +0200 |
| commit | 2c3f6dcdb6de8cd43371e91fb470e547aa217327 (patch) | |
| tree | 6a51ff7f6c31d6e99a248eada3e2052d26ebc680 /ext/imap/php_imap.c | |
| parent | 9fc38183b707341b6eddb8c196d0ea2b7c13d6a9 (diff) | |
| parent | e4a28b7b7b972fecd01458364c0663195352891e (diff) | |
| download | php-git-2c3f6dcdb6de8cd43371e91fb470e547aa217327.tar.gz | |
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
Conflicts:
NEWS
Diffstat (limited to 'ext/imap/php_imap.c')
| -rw-r--r-- | ext/imap/php_imap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index b154cb86b0..d697fa7911 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -1270,7 +1270,6 @@ PHP_FUNCTION(imap_reopen) int mailbox_len; long options = 0, retries = 0; pils *imap_le_struct; - MAILSTREAM *imap_stream; long flags=NIL; long cl_flags=NIL; @@ -1298,12 +1297,12 @@ PHP_FUNCTION(imap_reopen) RETURN_FALSE; } - imap_stream = mail_open(imap_le_struct->imap_stream, mailbox, flags); - if (imap_stream == NIL) { + imap_le_struct->imap_stream = mail_open(imap_le_struct->imap_stream, mailbox, flags); + if (imap_le_struct->imap_stream == NIL) { + zend_list_delete(Z_RESVAL_P(streamind)); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't re-open stream"); RETURN_FALSE; } - imap_le_struct->imap_stream = imap_stream; RETURN_TRUE; } /* }}} */ |