cvs: php-src /ext/imap php_imap.c
| From: | Pierre-Alain Joye | Date: | Sat, 25 Apr 2009 15:08:25 +0000 |
| Subject: | cvs: php-src /ext/imap php_imap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-57207@lists.php.net to get a copy of this message | ||
pajoye Sat Apr 25 15:08:25 2009 UTC
Modified files:
/php-src/ext/imap php_imap.c
Log:
- ws
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.277&r2=1.278&diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.277 php-src/ext/imap/php_imap.c:1.278
--- php-src/ext/imap/php_imap.c:1.277 Sat Apr 25 15:06:03 2009
+++ php-src/ext/imap/php_imap.c Sat Apr 25 15:08:25 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.277 2009/04/25 15:06:03 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.278 2009/04/25 15:08:25 pajoye Exp $ */
#define IMAP41
@@ -2198,7 +2198,6 @@
RETURN_FALSE;
}
-
ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
if (msgno < 1) {
@@ -2977,13 +2976,11 @@
return;
}
-
if (flags && ((flags & ~(FT_UID|FT_INTERNAL|FT_PREFETCHTEXT)) != 0)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options
parameter");
RETURN_FALSE;
}
-
ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap);
if ((argc == 3) && (flags & FT_UID)) {
@@ -3220,7 +3217,7 @@
return;
}
- if (flags && ((flags & ~FT_UID) != 0)) {
+ if (flags && ((flags & ~FT_UID) != 0)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter");
RETURN_FALSE;
}