From: Stanislav Malyshev <stas@php.net>
Date: Thu, 13 Sep 2007 20:04:22 +0000 (+0000)
Subject: disallow setting mail.force_extra_parameters from .htaccess
X-Git-Tag: php-5.2.5RC1~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd836153d674bafda5e1a1b54eecb559d8f76de1;p=php

disallow setting mail.force_extra_parameters from .htaccess
---

diff --git a/main/main.c b/main/main.c
index 2a69c66bb5..8ce3afef0f 100644
--- a/main/main.c
+++ b/main/main.c
@@ -318,6 +318,19 @@ static PHP_INI_MH(OnUpdateErrorLog)
 }
 /* }}} */
 
+/* {{{ PHP_INI_MH
+ */
+static PHP_INI_MH(OnChangeMailForceExtra)
+{
+	/* Don't allow changing it in htaccess */
+	if (stage == PHP_INI_STAGE_HTACCESS) {
+			return FAILURE;
+	}
+	return SUCCESS;
+}
+/* }}} */
+
+
 /* Need to convert to strings and make use of:
  * PHP_SAFE_MODE
  *
@@ -428,7 +441,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|PHP_INI_PERDIR,		NULL)
+	PHP_INI_ENTRY("mail.force_extra_parameters",NULL,		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnChangeMailForceExtra)
 	PHP_INI_ENTRY("disable_functions",			"",			PHP_INI_SYSTEM,		NULL)
 	PHP_INI_ENTRY("disable_classes",			"",			PHP_INI_SYSTEM,		NULL)