diff options
| author | Chuck Hagenbuch <chagenbu@php.net> | 2000-04-22 20:54:07 +0000 |
|---|---|---|
| committer | Chuck Hagenbuch <chagenbu@php.net> | 2000-04-22 20:54:07 +0000 |
| commit | 4b78e0aca6787924396eab466b1311f6abe2c01d (patch) | |
| tree | b5fd0f71c181691bcf0978e7f773597b1fa9106b /ext/imap/php_imap.c | |
| parent | 5da62dd57e31ed51f9879a6cf31143088ed0a8fc (diff) | |
| download | php-git-4b78e0aca6787924396eab466b1311f6abe2c01d.tar.gz | |
back off from high-performance api in imap_rfc822_parse_adrlist. if you
called it twice on the same string, there were _strange_ side effects. This
may be slower, but it works.
Diffstat (limited to 'ext/imap/php_imap.c')
| -rw-r--r-- | ext/imap/php_imap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 2782236082..33cceb0aec 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -2134,19 +2134,19 @@ PHP_FUNCTION(imap_rfc822_write_address) Parses an address string */ PHP_FUNCTION(imap_rfc822_parse_adrlist) { - zval **str, **defaulthost, *tovals; + zval *str, *defaulthost, *tovals; ADDRESS *addresstmp; ENVELOPE *env; int argc; - + env=mail_newenvelope(); argc=ZEND_NUM_ARGS(); - if (argc != 2 || zend_get_parameters_ex(argc, &str, &defaulthost) == FAILURE) { + if (argc != 2 || zend_get_parameters(ht, argc, &str, &defaulthost) == FAILURE) { ZEND_WRONG_PARAM_COUNT(); } - convert_to_string_ex(str); - convert_to_string_ex(defaulthost); - rfc822_parse_adrlist(&env->to, Z_STRVAL_PP(str), Z_STRVAL_PP(defaulthost)); + convert_to_string(str); + convert_to_string(defaulthost); + rfc822_parse_adrlist(&env->to, str->value.str.val, defaulthost->value.str.val); if (array_init(return_value) == FAILURE) { RETURN_FALSE; } |