From: Derick Rethans <derick@php.net>
Date: Thu, 20 May 2004 10:24:39 +0000 (+0000)
Subject: - Allow extra parameters to mail to be forced also from virtual host settings.
X-Git-Tag: RELEASE_0_1~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dcb0ee6ec4f6c22851a1dd58a4a74f0661fae25b;p=php

- Allow extra parameters to mail to be forced also from virtual host settings.
---

diff --git a/main/main.c b/main/main.c
index 87235a5a00..43e96d29f0 100644
--- a/main/main.c
+++ b/main/main.c
@@ -323,7 +323,7 @@ PHP_INI_BEGIN()
 	PHP_INI_ENTRY("precision",					"14",		PHP_INI_ALL,		OnSetPrecision)
 	PHP_INI_ENTRY("sendmail_from",				NULL,		PHP_INI_ALL,		NULL)
 	PHP_INI_ENTRY("sendmail_path",	DEFAULT_SENDMAIL_PATH,	PHP_INI_SYSTEM,		NULL)
-	PHP_INI_ENTRY("mail.force_extra_parameters",NULL,		PHP_INI_SYSTEM,		NULL)
+	PHP_INI_ENTRY("mail.force_extra_parameters",NULL,		PHP_INI_SYSTEM|PHP_INI_PERDIR,		NULL)
 	PHP_INI_ENTRY("disable_functions",			"",			PHP_INI_SYSTEM,		NULL)
 	PHP_INI_ENTRY("disable_classes",			"",			PHP_INI_SYSTEM,		NULL)