[svn:mod_parrot] r588 - in mod_parrot/trunk: docs lib/ModParrot/HLL

Author: jhorwitz
Date: Sun Jan 11 08:29:33 2009
New Revision: 588

Modified:
   mod_parrot/trunk/docs/apache-conf.txt
   mod_parrot/trunk/lib/ModParrot/HLL/pir.pir

Log:
remove ParrotCleanupHandler (keep spec PIR module aligned with real phases)


Modified: mod_parrot/trunk/docs/apache-conf.txt
==============================================================================
--- mod_parrot/trunk/docs/apache-conf.txt	(original)
+++ mod_parrot/trunk/docs/apache-conf.txt	Sun Jan 11 08:29:33 2009
@@ -169,10 +169,3 @@
 Default:     none
 Context:     directory config
 Description: Sets the Parrot log handler
-
-ParrotCleanupHandler
-----------------
-Syntax:      ParrotCleanupHandler handler
-Default:     none
-Context:     directory config
-Description: Sets the Parrot request cleanup handler

Modified: mod_parrot/trunk/lib/ModParrot/HLL/pir.pir
==============================================================================
--- mod_parrot/trunk/lib/ModParrot/HLL/pir.pir	(original)
+++ mod_parrot/trunk/lib/ModParrot/HLL/pir.pir	Sun Jan 11 08:29:33 2009
@@ -59,8 +59,6 @@
     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)
 
     # we want *all* the hooks
     hooks = new 'ResizablePMCArray'
@@ -267,14 +265,6 @@
     dircfg['log_handler'] = $S0
 .end
 
-.sub cmd_parrotcleanuphandler
-    .param pmc dircfg
-    .param pmc args
-
-    $S0 = args[0]
-    # XXX waiting on APR;Pool implementation
-.end
-
 .sub load
     .param string path
     load_bytecode path
@@ -907,42 +897,3 @@
     # return status code
     .return(status)
 .end
-
-# cleanup handler
-.sub cleanup_handler
-    .param pmc ctx
-    .local pmc r, handler, cfg, dircfg, get_config, ap_const
-    .local int status
-
-    ap_const = get_root_global ['ModParrot'; 'Apache'; 'Constants'], 'table'
-
-    # get the request_rec object
-    r = ctx.'request_rec'()
-
-    # get configs
-    get_config = get_hll_global ['ModParrot'; '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
-    $P0 = split ';', $S0
-    get_hll_global handler, $P0, 'handler'
-    status = handler(r)
-
-    # return status code
-    .return(status)
-.end