[PHP-CVS] cvs: php4(apache_hooks) /sapi/apache mod_php4.c

[George Schlossnagle]

gschlossnagle           Wed Oct 23 02:07:08 2002 EDT

  Modified files:              (Branch: apache_hooks)
    /php4/sapi/apache   mod_php4.c 
  Log:
  fixed directory merging
  
  
Index: php4/sapi/apache/mod_php4.c
diff -u php4/sapi/apache/mod_php4.c:1.120.2.11 php4/sapi/apache/mod_php4.c:1.120.2.12
--- php4/sapi/apache/mod_php4.c:1.120.2.11      Tue Oct  8 22:57:33 2002
+++ php4/sapi/apache/mod_php4.c Wed Oct 23 02:07:07 2002
@@ -17,7 +17,7 @@
    | PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>                      |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php4.c,v 1.120.2.11 2002/10/09 02:57:33 gschlossnagle Exp $ */
+/* $Id: mod_php4.c,v 1.120.2.12 2002/10/23 06:07:07 gschlossnagle Exp $ */
 
 #include "php_apache_http.h"
 
@@ -873,7 +873,15 @@
     php_per_dir_config *b = (php_per_dir_config *) basev;
        /* This function *must* return addv, and not modify basev */
        zend_hash_merge_ex((HashTable *) a->ini_settings, (HashTable *) 
b->ini_settings, (copy_ctor_func_t) copy_per_dir_entry, sizeof(php_per_dir_entry), 
(zend_bool (*)(void *, void *)) should_overwrite_per_dir_entry);
-       return addv;
+    a->headers_handlers = 
+(a->headers_handlers.top)?a->headers_handlers:b->headers_handlers;
+    a->auth_handlers = (a->auth_handlers.top)?a->auth_handlers:b->auth_handlers;
+    a->access_handlers = 
+(a->access_handlers.top)?a->access_handlers:b->access_handlers;
+    a->type_handlers = (a->type_handlers.top)?a->type_handlers:b->type_handlers;
+    a->fixup_handlers = (a->fixup_handlers.top)?a->fixup_handlers:b->fixup_handlers;
+    a->logger_handlers = 
+(a->logger_handlers.top)?a->logger_handlers:b->logger_handlers;
+    a->post_read_handlers = 
+(a->post_read_handlers.top)?a->post_read_handlers:b->post_read_handlers;
+    a->response_handlers = 
+(a->response_handlers.top)?a->response_handlers:b->response_handlers;
+       return a;
 }
 /* }}} */
 
@@ -1400,6 +1408,8 @@
        {"phpTypeHandler",              php_set_type_handler, NULL, OR_OPTIONS, TAKE1, 
"PHP Value Modifier"},
        {"phpTypeHandlerMethod",                php_set_type_handler_code, NULL, 
OR_OPTIONS, TAKE1, "PHP Value Modifier"},
        {"phpFixupHandler",             php_set_fixup_handler, NULL, OR_OPTIONS, 
TAKE1, "PHP Value Modifier"},
+       {"phpFixupHandlerMethod",               php_set_fixup_handler_code, NULL, 
+OR_OPTIONS, TAKE1, "PHP Value Modifier"},
+    {"phpLoggerHandler",            php_set_logger_handler, NULL, OR_OPTIONS, TAKE1, 
+"PHP Value Modifier"},
        {"phpLoggerHandlerMethod",              php_set_logger_handler_code, NULL, 
OR_OPTIONS, TAKE1, "PHP Value Modifier"},
 #if MODULE_MAGIC_NUMBER >= 19970902
        {"phpPostReadHandler",          php_set_post_read_handler, NULL, OR_OPTIONS, 
TAKE1, "PHP Value Modifier"},



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