[PHP-CVS] cvs: php-src /sapi/apache2filter apache_config.c

2007-08-06 Thread Jani Taskinen 
janiMon Aug  6 18:14:14 2007 UTC

  Modified files:  
/php-src/sapi/apache2filter apache_config.c 
  Log:
  Fix build
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/apache_config.c?r1=1.39r2=1.40diff_format=u
Index: php-src/sapi/apache2filter/apache_config.c
diff -u php-src/sapi/apache2filter/apache_config.c:1.39 
php-src/sapi/apache2filter/apache_config.c:1.40
--- php-src/sapi/apache2filter/apache_config.c:1.39 Fri Aug  3 09:38:43 2007
+++ php-src/sapi/apache2filter/apache_config.c  Mon Aug  6 18:14:13 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: apache_config.c,v 1.39 2007/08/03 09:38:43 jani Exp $ */
+/* $Id: apache_config.c,v 1.40 2007/08/06 18:14:13 jani Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -172,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.s, data-value));
-   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) {
+   if (zend_alter_ini_entry(str.s, 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

[PHP-CVS] cvs: php-src /sapi/apache2filter apache_config.c /sapi/apache2handler apache_config.c

2007-08-03 Thread Jani Taskinen 
janiFri Aug  3 09:38:43 2007 UTC

  Modified files:  
/php-src/sapi/apache2filter apache_config.c 
/php-src/sapi/apache2handlerapache_config.c 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/apache_config.c?r1=1.38r2=1.39diff_format=u
Index: php-src/sapi/apache2filter/apache_config.c
diff -u php-src/sapi/apache2filter/apache_config.c:1.38 
php-src/sapi/apache2filter/apache_config.c:1.39
--- php-src/sapi/apache2filter/apache_config.c:1.38 Mon Jan  1 09:29:36 2007
+++ php-src/sapi/apache2filter/apache_config.c  Fri Aug  3 09:38:43 2007
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: apache_config.c,v 1.38 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: apache_config.c,v 1.39 2007/08/03 09:38:43 jani Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -35,7 +35,7 @@
 #include http_log.h
 #include http_main.h
 #include util_script.h
-#include http_core.h 
+#include http_core.h
 
 #ifdef PHP_AP_DEBUG
 #define phpapdebug(a) fprintf a
@@ -51,16 +51,15 @@
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)
+static const char *real_value_hnd(cmd_parms *cmd, void *dummy, const char 
*name, const char *value, int status)
 {
php_conf_rec *d = dummy;
php_dir_entry e;
 
-   phpapdebug((stderr, Getting %s=%s for %p (%d)\n, name, value, dummy, 
-   zend_hash_num_elements(d-config)));
+   phpapdebug((stderr, Getting %s=%s for %p (%d)\n, name, value, dummy, 
zend_hash_num_elements(d-config)));

if (!strncasecmp(value, none, sizeof(none))) {
value = ;
@@ -69,26 +68,23 @@
e.value = apr_pstrdup(cmd-pool, value);
e.value_len = strlen(value);
e.status = status;
-   
-   zend_hash_update(d-config, (char *) name, strlen(name) + 1, e, 
-   sizeof(e), NULL);
+   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;
 }
 
-static const char *php_apache_value_handler(cmd_parms *cmd, void *dummy, 
-   const char *name, const char *value)
+static const char *php_apache_value_handler(cmd_parms *cmd, void *dummy, const 
char *name, const char *value)
 {
return real_value_hnd(cmd, dummy, name, value, PHP_INI_PERDIR);
 }
 
-static const char *php_apache_admin_value_handler(cmd_parms *cmd, void *dummy, 
-   const char *name, const char *value)
+static const char *php_apache_admin_value_handler(cmd_parms *cmd, void *dummy, 
const char *name, const char *value)
 {
return real_value_hnd(cmd, dummy, name, value, PHP_INI_SYSTEM);
 }
 
-static const char *real_flag_hnd(cmd_parms *cmd, void *dummy, const char *arg1,
-   const char *arg2, int status)
+static const char *real_flag_hnd(cmd_parms *cmd, void *dummy, const char 
*arg1, const char *arg2, int status)
 {
char bool_val[2];
 
@@ -102,24 +98,20 @@
return real_value_hnd(cmd, dummy, arg1, bool_val, status);
 }
 
-static const char *php_apache_flag_handler(cmd_parms *cmd, void *dummy, 
-   const char *name, const char *value)
+static const char *php_apache_flag_handler(cmd_parms *cmd, void *dummy, const 
char *name, const char *value)
 {
return real_flag_hnd(cmd, dummy, name, value, PHP_INI_PERDIR);
 }
 
-static const char *php_apache_admin_flag_handler(cmd_parms *cmd, void *dummy, 
-   const char *name, const char *value)
+static const char *php_apache_admin_flag_handler(cmd_parms *cmd, void *dummy, 
const char *name, const char *value)
 {
return real_flag_hnd(cmd, dummy, name, value, PHP_INI_SYSTEM);
 }
 
-static const char *php_apache_phpini_set(cmd_parms *cmd, void *mconfig, 
-   const char *arg)
+static const char *php_apache_phpini_set(cmd_parms *cmd, void *mconfig, const 
char *arg)
 {
if (apache2_php_ini_path_override) {
-   return Only first PHPINIDir directive honored per 
configuration tree 
-   - subsequent ones ignored;
+   return Only first PHPINIDir directive honored per 
configuration tree - subsequent ones ignored;
}
apache2_php_ini_path_override = ap_server_root_relative(cmd-pool, arg);
return NULL;
@@ -149,7 +141,7 @@
if (pe-status = data-status) continue;
}
zend_hash_update(n-config, str.s, str_len, data, 
sizeof(*data), NULL);
-   phpapdebug((stderr, ADDING/OVERWRITING %s (%d vs. %d)\n, str, 
data-status, pe?pe-status:-1));
+   phpapdebug((stderr, ADDING/OVERWRITING %s (%d vs. %d)\n, 
str.s, data-status,

[PHP-CVS] cvs: php-src /sapi/apache2filter apache_config.c

2006-06-09 Thread Michael Wallner 
mikeFri Jun  9 16:29:26 2006 UTC

  Modified files:  
/php-src/sapi/apache2filter apache_config.c 
  Log:
  - sync with apache2handler
  
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache2filter/apache_config.c?r1=1.36r2=1.37diff_format=u
Index: php-src/sapi/apache2filter/apache_config.c
diff -u php-src/sapi/apache2filter/apache_config.c:1.36 
php-src/sapi/apache2filter/apache_config.c:1.37
--- php-src/sapi/apache2filter/apache_config.c:1.36 Wed Mar  1 16:27:47 2006
+++ php-src/sapi/apache2filter/apache_config.c  Fri Jun  9 16:29:25 2006
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: apache_config.c,v 1.36 2006/03/01 16:27:47 dmitry Exp $ */
+/* $Id: apache_config.c,v 1.37 2006/06/09 16:29:25 mike Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -128,28 +128,31 @@
 
 void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf)
 {
-   php_conf_rec *d = base_conf, *e = new_conf;
+   php_conf_rec *d = base_conf, *e = new_conf, *n = NULL;
php_dir_entry *pe;
php_dir_entry *data;
zstr str;
uint str_len;
ulong num_index;
 
-   phpapdebug((stderr, Merge dir (%p) (%p)\n, base_conf, new_conf));
+   n = create_php_config(p, merge_php_config);
+   zend_hash_copy(n-config, e-config, NULL, NULL, 
sizeof(php_dir_entry));
+
+   phpapdebug((stderr, Merge dir (%p)+(%p)=(%p)\n, base_conf, new_conf, 
n));
for (zend_hash_internal_pointer_reset(d-config);
zend_hash_get_current_key_ex(d-config, str, 
str_len, 
num_index, 0, NULL) == HASH_KEY_IS_STRING;
zend_hash_move_forward(d-config)) {
pe = NULL;
zend_hash_get_current_data(d-config, (void **) data);
-   if (zend_hash_find(e-config, str.s, str_len, (void **) pe) 
== SUCCESS) {
+   if (zend_hash_find(n-config, str.s, str_len, (void **) pe) 
== SUCCESS) {
if (pe-status = data-status) continue;
}
-   zend_hash_update(e-config, str.s, str_len, data, 
sizeof(*data), NULL);
-   phpapdebug((stderr, ADDING/OVERWRITING %s (%d vs. %d)\n, str, 
-   data-status, pe?pe-status:-1));
+   zend_hash_update(n-config, str.s, str_len, data, 
sizeof(*data), NULL);
+   phpapdebug((stderr, ADDING/OVERWRITING %s (%d vs. %d)\n, str, 
data-status, pe?pe-status:-1));
}
-   return new_conf;
+
+   return n;
 }
 
 char *get_php_config(void *conf, char *name, size_t name_len)

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