diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-02-02 19:53:32 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-02-02 19:53:32 +0000 |
| commit | 3e4c1717ee4f4beb9c362942a113b90fff0a7fb0 (patch) | |
| tree | f5da1649f6cfb5ae06b09b9cab4fd19a4446a767 /ext/imap/php_imap.c | |
| parent | b65205028a2debc50c3e2ca1572da4c74ac87834 (diff) | |
| parent | 92576c7c49a3c104bc4aea4cfa378a029bb26c86 (diff) | |
| download | php-git-3e4c1717ee4f4beb9c362942a113b90fff0a7fb0.tar.gz | |
Merge branch 'master' into jsond
Diffstat (limited to 'ext/imap/php_imap.c')
| -rw-r--r-- | ext/imap/php_imap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 0e3ec533a6..ceaa53afcf 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -1235,7 +1235,7 @@ static void php_imap_do_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) imap_stream = mail_open(NIL, mailbox->val, flags); if (imap_stream == NIL) { - php_error_docref(NULL, E_WARNING, "Couldn't open stream %s", mailbox); + php_error_docref(NULL, E_WARNING, "Couldn't open stream %s", mailbox->val); efree(IMAPG(imap_user)); IMAPG(imap_user) = 0; efree(IMAPG(imap_password)); IMAPG(imap_password) = 0; RETURN_FALSE; @@ -1340,6 +1340,7 @@ PHP_FUNCTION(imap_append) } } + zend_string_free(regex); ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); INIT (&st, mail_string, (void *) message->val, message->len); @@ -4045,7 +4046,7 @@ PHP_FUNCTION(imap_search) int argc = ZEND_NUM_ARGS(); SEARCHPGM *pgm = NIL; - if (zend_parse_parameters(argc, "rs|lS", &streamind, &criteria, &flags, &charset) == FAILURE) { + if (zend_parse_parameters(argc, "rS|lS", &streamind, &criteria, &flags, &charset) == FAILURE) { return; } |