stas Fri Aug 3 01:14:44 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/apache mod_php5.c
Log:
implement separate .htaccess stage
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php5.c?r1=1.19.2.7.2.10&r2=1.19.2.7.2.11&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.10
php-src/sapi/apache/mod_php5.c:1.19.2.7.2.11
--- php-src/sapi/apache/mod_php5.c:1.19.2.7.2.10 Mon Jun 18 15:52:46 2007
+++ php-src/sapi/apache/mod_php5.c Fri Aug 3 01:14:44 2007
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.19.2.7.2.10 2007/06/18 15:52:46 scottmac Exp $ */
+/* $Id: mod_php5.c,v 1.19.2.7.2.11 2007/08/03 01:14:44 stas Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -80,6 +80,7 @@
uint key_length;
uint value_length;
int type;
+ char htaccess;
} php_per_dir_entry;
/* some systems are missing these from their header files */
@@ -547,7 +548,7 @@
*/
static int php_apache_alter_ini_entries(php_per_dir_entry *per_dir_entry
TSRMLS_DC)
{
- zend_alter_ini_entry(per_dir_entry->key, per_dir_entry->key_length+1,
per_dir_entry->value, per_dir_entry->value_length, per_dir_entry->type,
PHP_INI_STAGE_ACTIVATE);
+ zend_alter_ini_entry(per_dir_entry->key, per_dir_entry->key_length+1,
per_dir_entry->value, per_dir_entry->value_length, per_dir_entry->type,
data->htaccess?PHP_INI_STAGE_HTACCESS:PHP_INI_STAGE_ACTIVATE);
return 0;
}
/* }}} */
@@ -791,6 +792,7 @@
php_apache_startup(&apache_sapi_module);
}
per_dir_entry.type = mode;
+ per_dir_entry.htaccess = ((cmd->override & (RSRC_CONF|ACCESS_CONF)) ==
0);
if (strcasecmp(arg2, "none") == 0) {
arg2 = "";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
