[svn:mod_parrot] r433 - in mod_parrot/branches/hll-modules: lib/ModParrot/HLL src

[email protected] Fri, 19 Sep 2008 11:51:59 -0700 (PDT)
Newsgroups perl.cvs.mod_parrot
Message-ID <[email protected]>
Author: jhorwitz
Date: Fri Sep 19 11:51:58 2008
New Revision: 433

Modified:
   mod_parrot/branches/hll-modules/lib/ModParrot/HLL/pir.pir
   mod_parrot/branches/hll-modules/src/mod_parrot.c

Log:
convert remaining handlers to new model
remove all Parrot*Handler configuration directives from mod_parrot.c


Modified: mod_parrot/branches/hll-modules/lib/ModParrot/HLL/pir.pir
==============================================================================
--- mod_parrot/branches/hll-modules/lib/ModParrot/HLL/pir.pir	(original)
+++ mod_parrot/branches/hll-modules/lib/ModParrot/HLL/pir.pir	Fri Sep 19 11:51:58 2008
@@ -26,15 +26,43 @@
 
     cmds = new 'ResizablePMCArray'
 
-    $P0 = new_cmd('ParrotHandler', 'TAKE1', 'cmd_parrothandler', 'OR_AUTHCFG', 'usage: ParrotHandler handler-name')
+    $P0 = new_cmd('ParrotOpenLogsHandler', 'TAKE1', 'cmd_parrotopenlogshandler', 'RSRC_CONF', 'usage: ParrotOpenLogsHandler handler-name')
     cmds.push($P0)
-    $P0 = new_cmd('ParrotResponseHandler', 'TAKE1', 'cmd_parrothandler', 'OR_AUTHCFG', 'usage: ParrotResponseHandler handler-name')
+    $P0 = new_cmd('ParrotPostConfigHandler', 'TAKE1', 'cmd_parrotpostconfighandler', 'RSRC_CONF', 'usage: ParrotPostConfigHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotChildInitHandler', 'TAKE1', 'cmd_parrotchildinithandler', 'RSRC_CONF', 'usage: ParrotChildInitHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotChildExitHandler', 'TAKE1', 'cmd_parrotchildexithandler', 'RSRC_CONF', 'usage: ParrotChildExitHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotPreConnectionHandler', 'TAKE1', 'cmd_parrotpreconnectionhandler', 'RSRC_CONF', 'usage: ParrotPreConnectionHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotProcessConnectionHandler', 'TAKE1', 'cmd_parrotprocessconnectionhandler', 'RSRC_CONF', 'usage: ParrotProcessConnectionHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotMapToStorageHandler', 'TAKE1', 'cmd_parrotmaptostoragehandler', 'OR_AUTHCFG', 'usage: ParrotMapToStorageHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotTransHandler', 'TAKE1', 'cmd_parrottranshandler', 'OR_AUTHCFG', 'usage: ParrotTransHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotPostReadRequestHandler', 'TAKE1', 'cmd_parrotpostreadrequesthandler', 'OR_AUTHCFG', 'usage: ParrotPostReadRequestHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotHeaderParserHandler', 'TAKE1', 'cmd_parrotheaderparserhandler', 'OR_AUTHCFG', 'usage: ParrotHeaderParserHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotAccessHandler', 'TAKE1', 'cmd_parrotaccesshandler', 'OR_AUTHCFG', 'usage: ParrotAccessHandler handler-name')
     cmds.push($P0)
     $P0 = new_cmd('ParrotAuthenHandler', 'TAKE1', 'cmd_parrotauthenhandler', 'OR_AUTHCFG', 'usage: ParrotAuthenHandler handler-name')
     cmds.push($P0)
     $P0 = new_cmd('ParrotAuthzHandler', 'TAKE1', 'cmd_parrotauthzhandler', 'OR_AUTHCFG', 'usage: ParrotAuthzHandler handler-name')
     cmds.push($P0)
-    $P0 = new_cmd('ParrotAccessHandler', 'TAKE1', 'cmd_parrotaccesshandler', 'OR_AUTHCFG', 'usage: ParrotAccessHandler handler-name')
+    $P0 = new_cmd('ParrotResponseHandler', 'TAKE1', 'cmd_parrothandler', 'OR_AUTHCFG', 'usage: ParrotResponseHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotHandler', 'TAKE1', 'cmd_parrothandler', 'OR_AUTHCFG', 'usage: ParrotHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotTypeHandler', 'TAKE1', 'cmd_parrottypehandler', 'OR_AUTHCFG', 'usage: ParrotTypeHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotFixupHandler', 'TAKE1', 'cmd_parrotfixuphandler', 'OR_AUTHCFG', 'usage: ParrotFixupHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotLogHandler', 'TAKE1', 'cmd_parrotloghandler', 'OR_AUTHCFG', 'usage: ParrotlogHandler handler-name')
+    cmds.push($P0)
+    $P0 = new_cmd('ParrotCleanupHandler', 'TAKE1', 'cmd_parrotcleanuphandler', 'OR_AUTHCFG', 'usage: ParrotCleanupHandler handler-name')
     cmds.push($P0)
 
     add_module = get_hll_global [ 'Apache'; 'Module' ], 'add'
@@ -285,29 +313,40 @@
 # open logs handler
 .sub open_logs_handler
     .param pmc ctx
-    .param string handler_name
-    .local pmc pconf
-    .local pmc plog
-    .local pmc ptemp
-    .local pmc s
-    .local pmc handler
-    .local pmc func
+    .local pmc s, handler, cfg, get_config, ap_const, pconf, plog, ptemp, s
+    .local pmc pconf, plog, ptemp
     .local int status
 
+    ap_const = get_root_global ['Apache'; 'Constants'], 'ap_constants'
+
+    # get configs
+    get_config = get_hll_global ['Apache'; 'Module'], 'get_config'
+    cfg = get_config('modparrot_pir_module')
+
+    # decline if we have no handler in this section
+    $S0 = cfg['open_logs_handler']
+    if $S0 goto run_handler
+    # open_logs handlers must return OK
+    status = ap_const['OK']
+    .return(status)
+
+  run_handler:
+    # find the handler sub and call it
+    find_global handler, $S0, 'handler'
+
     # get the pool objects
-    func = get_root_global [ '_modparrot'; 'NCI' ], 'conf_pool'
-    pconf = func()
-    func = get_root_global [ '_modparrot'; 'NCI' ], 'log_pool'
-    plog = func()
-    func = get_root_global [ '_modparrot'; 'NCI' ], 'temp_pool'
-    ptemp = func()
+    # XXX need access to these from the context!
+    $P0 = get_root_global [ '_modparrot'; 'NCI' ], 'conf_pool'
+    pconf = $P0()
+    $P0 = get_root_global [ '_modparrot'; 'NCI' ], 'log_pool'
+    plog = $P0()
+    $P0 = get_root_global [ '_modparrot'; 'NCI' ], 'temp_pool'
+    ptemp = $P0()
 
     # get the server_rec object
-    func = get_root_global [ '_modparrot'; 'NCI' ], 'server_rec'
-    s = func()
+    $P0 = get_root_global [ '_modparrot'; 'NCI' ], 'server_rec'
+    s = $P0()
 
-    # find the handler sub and call it
-    find_global handler, handler_name, 'handler'
     status = handler(pconf, plog, ptemp, s)
 
     # return status code
@@ -317,29 +356,40 @@
 # post_config handler
 .sub post_config_handler
     .param pmc ctx
-    .param string handler_name
-    .local pmc pconf
-    .local pmc plog
-    .local pmc ptemp
-    .local pmc s
-    .local pmc handler
-    .local pmc func
+    .local pmc s, handler, cfg, get_config, ap_const, pconf, plog, ptemp, s
+    .local pmc pconf, plog, ptemp
     .local int status
 
+    ap_const = get_root_global ['Apache'; 'Constants'], 'ap_constants'
+
+    # get configs
+    get_config = get_hll_global ['Apache'; 'Module'], 'get_config'
+    cfg = get_config('modparrot_pir_module')
+
+    # decline if we have no handler in this section
+    $S0 = cfg['post_config_handler']
+    if $S0 goto run_handler
+    # open_logs handlers must return OK
+    status = ap_const['OK']
+    .return(status)
+
+  run_handler:
+    # find the handler sub and call it
+    find_global handler, $S0, 'handler'
+
     # get the pool objects
-    func = get_root_global [ '_modparrot'; 'NCI' ], 'conf_pool'
-    pconf = func()
-    func = get_root_global [ '_modparrot'; 'NCI' ], 'log_pool'
-    plog = func()
-    func = get_root_global [ '_modparrot'; 'NCI' ], 'temp_pool'
-    ptemp = func()
+    # XXX need access to these from the context!
+    $P0 = get_root_global [ '_modparrot'; 'NCI' ], 'conf_pool'
+    pconf = $P0()
+    $P0 = get_root_global [ '_modparrot'; 'NCI' ], 'log_pool'
+    plog = $P0()
+    $P0 = get_root_global [ '_modparrot'; 'NCI' ], 'temp_pool'
+    ptemp = $P0()
 
     # get the server_rec object
-    func = get_root_global [ '_modparrot'; 'NCI' ], 'server_rec'
-    s = func()
+    $P0 = get_root_global [ '_modparrot'; 'NCI' ], 'server_rec'
+    s = $P0()
 
-    # find the handler sub and call it
-    find_global handler, handler_name, 'handler'
     status = handler(pconf, plog, ptemp, s)
 
     # return status code
@@ -349,23 +399,36 @@
 # child init handler
 .sub child_init_handler
     .param pmc ctx
-    .param string handler_name
-    .local pmc pchild
-    .local pmc s
-    .local pmc handler
-    .local pmc func
+    .local pmc s, handler, cfg, get_config, ap_const, pchild, s
+    .local pmc pconf, plog, ptemp
     .local int status
 
-    # get the pool object
-    func = get_root_global [ '_modparrot'; 'NCI' ], 'child_pool'
-    pchild = func()
+    ap_const = get_root_global ['Apache'; 'Constants'], 'ap_constants'
+
+    # get configs
+    get_config = get_hll_global ['Apache'; 'Module'], 'get_config'
+    cfg = get_config('modparrot_pir_module')
 
-    # get the server_rec object
-    func = get_root_global [ '_modparrot'; 'NCI' ], 'server_rec'
-    s = func()
+    # decline if we have no handler in this section
+    $S0 = cfg['child_init_handler']
+    if $S0 goto run_handler
+    # open_logs handlers must return OK
+    status = ap_const['OK']
+    .return(status)
 
+  run_handler:
     # find the handler sub and call it
-    find_global handler, handler_name, 'handler'
+    find_global handler, $S0, 'handler'
+
+    # get the pool objects
+    # XXX need access to these from the context!
+    $P0 = get_root_global [ '_modparrot'; 'NCI' ], 'child_pool'
+    pchild = $P0()
+
+    # get the server_rec object
+    $P0 = get_root_global [ '_modparrot'; 'NCI' ], 'server_rec'
+    s = $P0()
+
     status = handler(pchild, s)
 
     # return status code
@@ -375,23 +438,34 @@
 # pre connection handler
 .sub pre_connection_handler
     .param pmc ctx
-    .param string handler_name
-    .local pmc c
-    .local pmc csd
-    .local pmc handler
-    .local pmc func
+    .local pmc s, handler, cfg, get_config, ap_const, c, csd
+    .local pmc pconf, plog, ptemp
     .local int status
 
-    # get the conn_rec object
-    func = get_root_global [ '_modparrot'; 'NCI' ], 'conn_rec'
-    c = func()
+    ap_const = get_root_global ['Apache'; 'Constants'], 'ap_constants'
+
+    # get configs
+    get_config = get_hll_global ['Apache'; 'Module'], 'get_config'
+    cfg = get_config('modparrot_pir_module')
 
-    # get the csd object
-    func = get_root_global [ '_modparrot'; 'NCI' ], 'csd'
-    csd = func()
+    # decline if we have no handler in this section
+    $S0 = cfg['pre_connection_handler']
+    if $S0 goto run_handler
+    # open_logs handlers must return OK
+    status = ap_const['OK']
+    .return(status)
 
+  run_handler:
     # find the handler sub and call it
-    find_global handler, handler_name, 'handler'
+    find_global handler, $S0, 'handler'
+
+    # get the pool objects
+    # XXX need access to these from the context!
+    $P0 = get_root_global [ '_modparrot'; 'NCI' ], 'conn_rec'
+    c = $P0()
+    $P0 = get_root_global [ '_modparrot'; 'NCI' ], 'csd'
+    csd = $P0()
+
     status = handler(c, csd)
 
     # return status code
@@ -401,38 +475,71 @@
 # process connection handler
 .sub process_connection_handler
     .param pmc ctx
-    .param string handler_name
-    .local pmc c
-    .local pmc handler
-    .local pmc func
+    .local pmc s, handler, cfg, get_config, ap_const, c
+    .local pmc pconf, plog, ptemp
     .local int status
 
-    # get the pool object
-    func = get_root_global [ '_modparrot'; 'NCI' ], 'conn_rec'
-    c = func()
+    ap_const = get_root_global ['Apache'; 'Constants'], 'ap_constants'
+
+    # get configs
+    get_config = get_hll_global ['Apache'; 'Module'], 'get_config'
+    cfg = get_config('modparrot_pir_module')
+
+    # decline if we have no handler in this section
+    $S0 = cfg['process_connection_handler']
+    if $S0 goto run_handler
+    # open_logs handlers must return OK
+    status = ap_const['OK']
+    .return(status)
 
+  run_handler:
     # find the handler sub and call it
-    find_global handler, handler_name, 'handler'
+    find_global handler, $S0, 'handler'
+
+    # get the pool objects
+    # XXX need access to these from the context!
+    $P0 = get_root_global [ '_modparrot'; 'NCI' ], 'c'
+    c = $P0()
+
     status = handler(c)
 
     # return status code
     .return(status)
+
 .end
 
 # trans handler
 .sub trans_handler
     .param pmc ctx
-    .param string handler_name
-    .local pmc r
-    .local pmc handler
-    .local pmc func
+    .local pmc r, handler, cfg, dircfg, get_config, ap_const
     .local int status
 
+    ap_const = get_root_global ['Apache'; 'Constants'], 'ap_constants'
+
     # get the request_rec object
     r = ctx.'request_rec'()
 
+    # get configs
+    get_config = get_hll_global ['Apache'; 'Module'], 'get_config'
+    cfg = get_config('modparrot_pir_module')
+    $P0 = r.'per_dir_config'()
+    dircfg = get_config('modparrot_pir_module', $P0)
+
+    # decline if we have no config in this section
+    unless null dircfg goto get_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  get_handler:
+    # decline if we have no handler in this section
+    $S0 = dircfg['trans_handler']
+    if $S0 goto run_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  run_handler:
     # find the handler sub and call it
-    find_global handler, handler_name, 'handler'
+    find_global handler, $S0, 'handler'
     status = handler(r)
 
     # return status code
@@ -442,17 +549,35 @@
 # fixup handler
 .sub fixup_handler
     .param pmc ctx
-    .param string handler_name
-    .local pmc r
-    .local pmc handler
-    .local pmc func
+    .local pmc r, handler, cfg, dircfg, get_config, ap_const
     .local int status
 
+    ap_const = get_root_global ['Apache'; 'Constants'], 'ap_constants'
+
     # get the request_rec object
     r = ctx.'request_rec'()
 
+    # get configs
+    get_config = get_hll_global ['Apache'; 'Module'], 'get_config'
+    cfg = get_config('modparrot_pir_module')
+    $P0 = r.'per_dir_config'()
+    dircfg = get_config('modparrot_pir_module', $P0)
+
+    # decline if we have no config in this section
+    unless null dircfg goto get_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  get_handler:
+    # decline if we have no handler in this section
+    $S0 = dircfg['fixup_handler']
+    if $S0 goto run_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  run_handler:
     # find the handler sub and call it
-    find_global handler, handler_name, 'handler'
+    find_global handler, $S0, 'handler'
     status = handler(r)
 
     # return status code
@@ -462,17 +587,35 @@
 # type handler
 .sub type_handler
     .param pmc ctx
-    .param string handler_name
-    .local pmc r
-    .local pmc handler
-    .local pmc func
+    .local pmc r, handler, cfg, dircfg, get_config, ap_const
     .local int status
 
+    ap_const = get_root_global ['Apache'; 'Constants'], 'ap_constants'
+
     # get the request_rec object
     r = ctx.'request_rec'()
 
+    # get configs
+    get_config = get_hll_global ['Apache'; 'Module'], 'get_config'
+    cfg = get_config('modparrot_pir_module')
+    $P0 = r.'per_dir_config'()
+    dircfg = get_config('modparrot_pir_module', $P0)
+
+    # decline if we have no config in this section
+    unless null dircfg goto get_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  get_handler:
+    # decline if we have no handler in this section
+    $S0 = dircfg['type_handler']
+    if $S0 goto run_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  run_handler:
     # find the handler sub and call it
-    find_global handler, handler_name, 'handler'
+    find_global handler, $S0, 'handler'
     status = handler(r)
 
     # return status code
@@ -482,17 +625,35 @@
 # log handler
 .sub log_handler
     .param pmc ctx
-    .param string handler_name
-    .local pmc r
-    .local pmc handler
-    .local pmc func
+    .local pmc r, handler, cfg, dircfg, get_config, ap_const
     .local int status
 
+    ap_const = get_root_global ['Apache'; 'Constants'], 'ap_constants'
+
     # get the request_rec object
     r = ctx.'request_rec'()
 
+    # get configs
+    get_config = get_hll_global ['Apache'; 'Module'], 'get_config'
+    cfg = get_config('modparrot_pir_module')
+    $P0 = r.'per_dir_config'()
+    dircfg = get_config('modparrot_pir_module', $P0)
+
+    # decline if we have no config in this section
+    unless null dircfg goto get_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  get_handler:
+    # decline if we have no handler in this section
+    $S0 = dircfg['log_handler']
+    if $S0 goto run_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  run_handler:
     # find the handler sub and call it
-    find_global handler, handler_name, 'handler'
+    find_global handler, $S0, 'handler'
     status = handler(r)
 
     # return status code
@@ -502,17 +663,35 @@
 # map_to_storage handler
 .sub map_to_storage_handler
     .param pmc ctx
-    .param string handler_name
-    .local pmc r
-    .local pmc handler
-    .local pmc func
+    .local pmc r, handler, cfg, dircfg, get_config, ap_const
     .local int status
 
+    ap_const = get_root_global ['Apache'; 'Constants'], 'ap_constants'
+
     # get the request_rec object
     r = ctx.'request_rec'()
 
+    # get configs
+    get_config = get_hll_global ['Apache'; 'Module'], 'get_config'
+    cfg = get_config('modparrot_pir_module')
+    $P0 = r.'per_dir_config'()
+    dircfg = get_config('modparrot_pir_module', $P0)
+
+    # decline if we have no config in this section
+    unless null dircfg goto get_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  get_handler:
+    # decline if we have no handler in this section
+    $S0 = dircfg['map_to_storage_handler']
+    if $S0 goto run_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  run_handler:
     # find the handler sub and call it
-    find_global handler, handler_name, 'handler'
+    find_global handler, $S0, 'handler'
     status = handler(r)
 
     # return status code
@@ -522,36 +701,74 @@
 # post_read_request handler
 .sub post_read_request_handler
     .param pmc ctx
-    .param string handler_name
-    .local pmc r
-    .local pmc handler
-    .local pmc func
+    .local pmc r, handler, cfg, dircfg, get_config, ap_const
     .local int status
 
+    ap_const = get_root_global ['Apache'; 'Constants'], 'ap_constants'
+
     # get the request_rec object
     r = ctx.'request_rec'()
 
+    # get configs
+    get_config = get_hll_global ['Apache'; 'Module'], 'get_config'
+    cfg = get_config('modparrot_pir_module')
+    $P0 = r.'per_dir_config'()
+    dircfg = get_config('modparrot_pir_module', $P0)
+
+    # decline if we have no config in this section
+    unless null dircfg goto get_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  get_handler:
+    # decline if we have no handler in this section
+    $S0 = dircfg['post_read_request_handler']
+    if $S0 goto run_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  run_handler:
     # find the handler sub and call it
-    find_global handler, handler_name, 'handler'
+    find_global handler, $S0, 'handler'
     status = handler(r)
 
     # return status code
     .return(status)
+
 .end
 
 # header_parser handler
 .sub header_parser_handler
     .param pmc ctx
-    .param string handler_name
-    .local pmc r
-    .local pmc handler
+    .local pmc r, handler, cfg, dircfg, get_config, ap_const
     .local int status
 
+    ap_const = get_root_global ['Apache'; 'Constants'], 'ap_constants'
+
     # get the request_rec object
     r = ctx.'request_rec'()
 
+    # get configs
+    get_config = get_hll_global ['Apache'; 'Module'], 'get_config'
+    cfg = get_config('modparrot_pir_module')
+    $P0 = r.'per_dir_config'()
+    dircfg = get_config('modparrot_pir_module', $P0)
+
+    # decline if we have no config in this section
+    unless null dircfg goto get_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  get_handler:
+    # decline if we have no handler in this section
+    $S0 = dircfg['header_parser_handler']
+    if $S0 goto run_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  run_handler:
     # find the handler sub and call it
-    find_global handler, handler_name, 'handler'
+    find_global handler, $S0, 'handler'
     status = handler(r)
 
     # return status code
@@ -561,16 +778,35 @@
 # cleanup handler
 .sub cleanup_handler
     .param pmc ctx
-    .param string handler_name
-    .local pmc r
-    .local pmc handler
+    .local pmc r, handler, cfg, dircfg, get_config, ap_const
     .local int status
 
+    ap_const = get_root_global ['Apache'; 'Constants'], 'ap_constants'
+
     # get the request_rec object
     r = ctx.'request_rec'()
 
+    # get configs
+    get_config = get_hll_global ['Apache'; 'Module'], 'get_config'
+    cfg = get_config('modparrot_pir_module')
+    $P0 = r.'per_dir_config'()
+    dircfg = get_config('modparrot_pir_module', $P0)
+
+    # decline if we have no config in this section
+    unless null dircfg goto get_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  get_handler:
+    # decline if we have no handler in this section
+    $S0 = dircfg['cleanup_handler']
+    if $S0 goto run_handler
+    status = ap_const['DECLINED']
+    .return(status)
+
+  run_handler:
     # find the handler sub and call it
-    find_global handler, handler_name, 'handler'
+    find_global handler, $S0, 'handler'
     status = handler(r)
 
     # return status code

Modified: mod_parrot/branches/hll-modules/src/mod_parrot.c
==============================================================================
--- mod_parrot/branches/hll-modules/src/mod_parrot.c	(original)
+++ mod_parrot/branches/hll-modules/src/mod_parrot.c	Fri Sep 19 11:51:58 2008
@@ -825,104 +825,6 @@
         "enable Parrot opcode tracing (default is off)"
     ),
     AP_INIT_TAKE1(
-        "ParrotOpenLogsHandler",
-        modparrot_cmd_open_logs_handler,
-        NULL,
-        RSRC_CONF,
-        "set the Parrot open logs handler"
-    ),
-    AP_INIT_TAKE1(
-        "ParrotChildInitHandler",
-        modparrot_cmd_child_init_handler,
-        NULL,
-        RSRC_CONF,
-        "set the Parrot child init handler"
-    ),
-    AP_INIT_TAKE1(
-        "ParrotChildExitHandler",
-        modparrot_cmd_child_exit_handler,
-        NULL,
-        RSRC_CONF,
-        "set the Parrot child exit handler"
-    ),
-    AP_INIT_TAKE1(
-        "ParrotPostConfigHandler",
-        modparrot_cmd_post_config_handler,
-        NULL,
-        RSRC_CONF,
-        "set the Parrot child exit handler"
-    ),
-    AP_INIT_TAKE1(
-        "ParrotPreConnectionHandler",
-        modparrot_cmd_pre_connection_handler,
-        NULL,
-        RSRC_CONF,
-        "set the Parrot pre-connection handler"
-    ),
-    AP_INIT_TAKE1(
-        "ParrotProcessConnectionHandler",
-        modparrot_cmd_process_connection_handler,
-        NULL,
-        RSRC_CONF,
-        "set the Parrot process-connection handler"
-    ),
-    AP_INIT_TAKE1(
-        "ParrotMapToStorageHandler",
-        modparrot_cmd_map_to_storage_handler,
-        NULL,
-        RSRC_CONF,
-        "set the Parrot map to storage handler"
-    ),
-    AP_INIT_TAKE1(
-        "ParrotTransHandler",
-        modparrot_cmd_trans_handler,
-        NULL,
-        RSRC_CONF,
-        "set the Parrot trans handler"
-    ),
-    AP_INIT_TAKE1(
-        "ParrotPostReadRequestHandler",
-        modparrot_cmd_post_read_request_handler,
-        NULL,
-        RSRC_CONF,
-        "set the Parrot post read request handler"
-    ),
-    AP_INIT_TAKE1(
-        "ParrotHeaderParserHandler",
-        modparrot_cmd_header_parser_handler,
-        NULL,
-        OR_AUTHCFG,
-        "set the Parrot header parser handler"
-    ),
-    AP_INIT_TAKE1(
-        "ParrotTypeHandler",
-        modparrot_cmd_type_handler,
-        NULL,
-        OR_AUTHCFG,
-        "set the Parrot type handler"
-    ),
-    AP_INIT_TAKE1(
-        "ParrotFixupHandler",
-        modparrot_cmd_fixup_handler,
-        NULL,
-        OR_AUTHCFG,
-        "set the Parrot fixup handler"
-    ),
-    AP_INIT_TAKE1(
-        "ParrotLogHandler",
-        modparrot_cmd_log_handler,
-        NULL,
-        OR_AUTHCFG,
-        "set the Parrot log handler"
-    ),
-    AP_INIT_TAKE1(
-        "ParrotCleanupHandler",
-        modparrot_cmd_cleanup_handler,
-        NULL,
-        OR_AUTHCFG,
-        "set the Parrot cleanup handler"
-    ),
-    AP_INIT_TAKE1(
         "ParrotLanguage",
         modparrot_cmd_language,
         NULL,