archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MF5: fix for access control with .htaccess

Browse source
This commit is contained in:
Stanislav Malyshev 2007-08-03 01:40:05 +00:00
parent c54e9706fd
commit d4cc7daba2
7 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sapi/apache/mod_php.c
View file

@ -76,6 +76,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 */
@ -540,7 +541,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;
}
/* }}} */
@ -776,6 +777,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 = "";