clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Instead of calling mail_fetchheader_full() to retrieve the complete header

Browse Source 
information just to extract the message envelope, call mail_fetchenvelope(),
which returns just what we need.

This is simpler, faster, and saves the IMAP server some work.

Submitted by: Adam Kauffman <adam.kauffman@mindspring.com>
This commit is contained in:
Jon Parise 2002-05-13 00:29:22 +00:00
parent 80c6418119
commit 9ec5aa9a92
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ext/imap/php_imap.c
View File

@ -1583,10 +1583,9 @@ PHP_FUNCTION(imap_headerinfo)
{
zval **streamind, **msgno, **fromlength, **subjectlength, **defaulthost;
pils *imap_le_struct;
unsigned long length;
MESSAGECACHE *cache;
ENVELOPE *en;
char *mystring, dummy[2000], fulladdress[MAILTMPLEN];
char dummy[2000], fulladdress[MAILTMPLEN];
int myargc = ZEND_NUM_ARGS();
if (myargc < 2 || myargc > 5 || zend_get_parameters_ex(myargc, &streamind, &msgno, &fromlength, &subjectlength, &defaulthost) == FAILURE) {
@ -1621,13 +1620,8 @@ PHP_FUNCTION(imap_headerinfo)
RETURN_FALSE;
}
mystring = mail_fetchheader_full(imap_le_struct->imap_stream, Z_LVAL_PP(msgno), NIL, &length, NIL);
if (myargc == 5) {
rfc822_parse_msg(&en, NULL, mystring, length, NULL, Z_STRVAL_PP(defaulthost), NIL);
} else {
rfc822_parse_msg(&en, NULL, mystring, length, NULL, "UNKNOWN", NIL);
}
en = mail_fetchenvelope(imap_le_struct->imap_stream, Z_LVAL_PP(msgno));
/* call a function to parse all the text, so that we can use the
same function to parse text from other sources */
_php_make_header_object(return_value, en TSRMLS_CC);
@ -1662,7 +1656,6 @@ PHP_FUNCTION(imap_headerinfo)
mail_fetchsubject(fulladdress, imap_le_struct->imap_stream, Z_LVAL_PP(msgno), Z_LVAL_PP(subjectlength));
add_property_string(return_value, "fetchsubject", fulladdress, 1);
}
mail_free_envelope(&en);
}
/* }}} */