diff options
| author | Stanislav Malyshev <stas@php.net> | 2007-08-03 01:14:44 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2007-08-03 01:14:44 +0000 |
| commit | c94dee86969d1dd58386f9b8c780a38e2b4532eb (patch) | |
| tree | 64546a8f8c60790d6193446ef2788bfb55bf4708 /sapi/apache/mod_php5.c | |
| parent | 0ad85237ea66098fc1084072c0c38e534a7592fd (diff) | |
| download | php-git-c94dee86969d1dd58386f9b8c780a38e2b4532eb.tar.gz | |
implement separate .htaccess stage
Diffstat (limited to 'sapi/apache/mod_php5.c')
| -rw-r--r-- | sapi/apache/mod_php5.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c index 439ef168e7..d41d9dfcd6 100644 --- a/sapi/apache/mod_php5.c +++ b/sapi/apache/mod_php5.c @@ -80,6 +80,7 @@ typedef struct _php_per_dir_entry { 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 void init_request_info(TSRMLS_D) */ 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 @@ static CONST_PREFIX char *php_apache_value_handler_ex(cmd_parms *cmd, HashTable 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 = ""; |