On Wed, 23 Oct 2002, George Schlossnagle wrote:
> gschlossnagle Wed Oct 23 02:07:08 2002 EDT
>
> Modified files: (Branch: apache_hooks)
> /php4/sapi/apache mod_php4.c
> Log:
> fixed directory merging
>
[...]
> 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;
[...]
> {"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"},
Can you please use tabs instead of spaces?
Derick
--
---------------------------------------------------------------------------
Derick Rethans http://derickrethans.nl/
JDI Media Solutions
--------------[ if you hold a unix shell to your ear, do you hear the c? ]-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
