dmitry Thu Aug 3 09:56:50 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/sapi/apache mod_php5.c
/php-src/sapi/apache_hooks mod_php5.c
Log:
Added "PHPINIDir" Apache directive to apache and apache_hooks SAPIs
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.176&r2=1.2027.2.547.2.177&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.176 php-src/NEWS:1.2027.2.547.2.177
--- php-src/NEWS:1.2027.2.547.2.176 Wed Aug 2 15:44:33 2006
+++ php-src/NEWS Thu Aug 3 09:56:49 2006
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Aug 2006, PHP 5.2.0RC2
+- Added "PHPINIDir" Apache directive to apache and apache_hooks SAPIs. (Dmitry)
- Added an optional boolean parameter to memory_get_usage() and
memory_get_peak_usage() to get memory size allocated by emalloc() or real
size of memory allocated from system. (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php5.c?r1=1.19.2.7.2.4&r2=1.19.2.7.2.5&diff_format=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.19.2.7.2.4
php-src/sapi/apache/mod_php5.c:1.19.2.7.2.5
--- php-src/sapi/apache/mod_php5.c:1.19.2.7.2.4 Tue Jul 25 13:40:05 2006
+++ php-src/sapi/apache/mod_php5.c Thu Aug 3 09:56:50 2006
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.19.2.7.2.4 2006/07/25 13:40:05 dmitry Exp $ */
+/* $Id: mod_php5.c,v 1.19.2.7.2.5 2006/08/03 09:56:50 dmitry Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -863,6 +863,18 @@
}
/* }}} */
+/* {{{ php_apache_phpini_set
+ */
+static CONST_PREFIX char *php_apache_phpini_set(cmd_parms *cmd, HashTable
*conf, char *arg)
+{
+ if (apache_sapi_module.php_ini_path_override) {
+ return "Only first PHPINIDir directive honored per
configuration tree - subsequent ones ignored";
+ }
+ apache_sapi_module.php_ini_path_override =
ap_server_root_relative(cmd->pool, arg);
+ return NULL;
+}
+/* }}} */
+
/* {{{ int php_xbithack_handler(request_rec * r)
*/
static int php_xbithack_handler(request_rec * r)
@@ -965,6 +977,7 @@
{"php_flag", php_apache_flag_handler, NULL, OR_OPTIONS,
TAKE2, "PHP Flag Modifier"},
{"php_admin_value", php_apache_admin_value_handler, NULL,
ACCESS_CONF|RSRC_CONF, TAKE2, "PHP Value Modifier (Admin)"},
{"php_admin_flag", php_apache_admin_flag_handler, NULL,
ACCESS_CONF|RSRC_CONF, TAKE2, "PHP Flag Modifier (Admin)"},
+ {"PHPINIDir", php_apache_phpini_set, NULL, RSRC_CONF, TAKE1,
"Directory containing the php.ini file"},
{NULL}
};
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/mod_php5.c?r1=1.11.2.1.2.2&r2=1.11.2.1.2.3&diff_format=u
Index: php-src/sapi/apache_hooks/mod_php5.c
diff -u php-src/sapi/apache_hooks/mod_php5.c:1.11.2.1.2.2
php-src/sapi/apache_hooks/mod_php5.c:1.11.2.1.2.3
--- php-src/sapi/apache_hooks/mod_php5.c:1.11.2.1.2.2 Tue Jul 25 13:40:05 2006
+++ php-src/sapi/apache_hooks/mod_php5.c Thu Aug 3 09:56:50 2006
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.11.2.1.2.2 2006/07/25 13:40:05 dmitry Exp $ */
+/* $Id: mod_php5.c,v 1.11.2.1.2.3 2006/08/03 09:56:50 dmitry Exp $ */
#include "php_apache_http.h"
@@ -1160,6 +1160,18 @@
}
/* }}} */
+/* {{{ php_apache_phpini_set
+ */
+static CONST_PREFIX char *php_apache_phpini_set(cmd_parms *cmd, HashTable
*conf, char *arg)
+{
+ if (apache_sapi_module.php_ini_path_override) {
+ return "Only first PHPINIDir directive honored per
configuration tree - subsequent ones ignored";
+ }
+ apache_sapi_module.php_ini_path_override =
ap_server_root_relative(cmd->pool, arg);
+ return NULL;
+}
+/* }}} */
+
/* {{{ int php_xbithack_handler(request_rec * r)
*/
static int php_xbithack_handler(request_rec * r)
@@ -1431,6 +1443,7 @@
{"php_flag", php_apache_flag_handler, NULL, OR_OPTIONS,
TAKE2, "PHP Flag Modifier"},
{"php_admin_value", php_apache_admin_value_handler, NULL,
ACCESS_CONF|RSRC_CONF, TAKE2, "PHP Value Modifier (Admin)"},
{"php_admin_flag", php_apache_admin_flag_handler, NULL,
ACCESS_CONF|RSRC_CONF, TAKE2, "PHP Flag Modifier (Admin)"},
+ {"PHPINIDir", php_apache_phpini_set, NULL, RSRC_CONF, TAKE1,
"Directory containing the php.ini file"},
{NULL}
};
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
