Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:19106 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 86925 invoked by uid 1010); 20 Sep 2005 22:00:52 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 86910 invoked from network); 20 Sep 2005 22:00:52 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 20 Sep 2005 22:00:52 -0000 X-Host-Fingerprint: 206.190.36.81 smtp103.rog.mail.re2.yahoo.com Received: from ([206.190.36.81:33695] helo=smtp103.rog.mail.re2.yahoo.com) by pb1.pair.com (ecelerity 2.0 beta r(6323M)) with SMTP id BD/2C-19329-49680334 for ; Tue, 20 Sep 2005 18:00:52 -0400 Received: (qmail 20103 invoked from network); 20 Sep 2005 22:00:49 -0000 Received: from unknown (HELO ?192.168.0.210?) (mtabini@70.28.238.97 with login) by smtp103.rog.mail.re2.yahoo.com with SMTP; 20 Sep 2005 22:00:49 -0000 User-Agent: Microsoft-Entourage/11.1.0.040913 Date: Tue, 20 Sep 2005 18:00:46 -0400 To: 'internals' Message-ID: Mime-version: 1.0 Content-type: text/plain; charset="US-ASCII" Content-transfer-encoding: 7bit Subject: Patch for bug #34565 From: marcot@tabini.ca (Marco Tabini) [Resending with patch inline] Hi-- Could someone with karma check that this patch is ok for bug #34565 and commit it to CVS? The patch is against HEAD -- not sure if a separate commit needs to be made against the 4.x and 5.x branches (and would appreciate some pointers on this topic). Cheers! Marco Index: ext/mbstring/mbstring.c =================================================================== RCS file: /repository/php-src/ext/mbstring/mbstring.c,v retrieving revision 1.224 diff -u -b -w -B -r1.224 mbstring.c --- ext/mbstring/mbstring.c 3 Aug 2005 14:07:24 -0000 1.224 +++ ext/mbstring/mbstring.c 20 Sep 2005 21:51:25 -0000 @@ -3007,6 +3007,7 @@ int subject_len; char *extra_cmd=NULL; int extra_cmd_len; + char *force_extra_parameters = INI_STR("mail.force_extra_parameters"); struct { int cnt_type:1; int cnt_trans_enc:1; @@ -3208,6 +3209,12 @@ mbfl_memory_device_output('\0', &device); headers = (char *)device.buffer; + if (force_extra_parameters) { + extra_cmd = estrdup(force_extra_parameters); + } else if (extra_cmd) { + extra_cmd = php_escape_shell_cmd(extra_cmd); + } + if (!err && php_mail(to, subject, message, headers, extra_cmd TSRMLS_CC)) { RETVAL_TRUE; } else {