[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/apache2handler apache_config.c

[Stanislav Malyshev]

stas            Fri Aug  3 01:14:23 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/sapi/apache2handler        apache_config.c 
  Log:
  implement separate .htaccess stage
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/apache_config.c?r1=1.7.2.1.2.2&r2=1.7.2.1.2.3&diff_format=u
Index: php-src/sapi/apache2handler/apache_config.c
diff -u php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.2 
php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.3
--- php-src/sapi/apache2handler/apache_config.c:1.7.2.1.2.2     Mon Jan  1 
09:36:12 2007
+++ php-src/sapi/apache2handler/apache_config.c Fri Aug  3 01:14:23 2007
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: apache_config.c,v 1.7.2.1.2.2 2007/01/01 09:36:12 sebastian Exp $ */
+/* $Id: apache_config.c,v 1.7.2.1.2.3 2007/08/03 01:14:23 stas Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -51,6 +51,7 @@
        char *value;
        size_t value_len;
        char status;
+    char htaccess;
 } php_dir_entry;
 
 static const char *real_value_hnd(cmd_parms *cmd, void *dummy, const char 
*name, const char *value, int status)
@@ -67,7 +68,8 @@
        e.value = apr_pstrdup(cmd->pool, value);
        e.value_len = strlen(value);
        e.status = status;
-       
+       e.htaccess = ((cmd->override & (RSRC_CONF|ACCESS_CONF)) == 0);
+
        zend_hash_update(&d->config, (char *) name, strlen(name) + 1, &e, 
sizeof(e), NULL);
        return NULL;
 }
@@ -170,7 +172,7 @@
                        zend_hash_move_forward(&d->config)) {
                zend_hash_get_current_data(&d->config, (void **) &data);
                phpapdebug((stderr, "APPLYING (%s)(%s)\n", str, data->value));
-               if (zend_alter_ini_entry(str, str_len, data->value, 
data->value_len, data->status, PHP_INI_STAGE_ACTIVATE) == FAILURE) {
+               if (zend_alter_ini_entry(str, str_len, data->value, 
data->value_len, data->status, 
data->htaccess?PHP_INI_STAGE_HTACCESS:PHP_INI_STAGE_ACTIVATE) == FAILURE) {
                        phpapdebug((stderr, "..FAILED\n"));
                }       
        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php