[Opensrf-commits] r1473 - branches/rel_1_0/src/gateway

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-10-24 12:30:33 -0400 (Fri, 24 Oct 2008)
New Revision: 1473

Modified:
   branches/rel_1_0/src/gateway/osrf_http_translator.c
   branches/rel_1_0/src/gateway/osrf_json_gateway.c
Log:
the pool cleanup handler which was thought to only run on top-level child process exit is running on cloned processes cleanup.  this is how mod_cgi runs scripts.  disabling cleanup for now.  note: this cleanup is new to 1.0

Modified: branches/rel_1_0/src/gateway/osrf_http_translator.c
===================================================================
--- branches/rel_1_0/src/gateway/osrf_http_translator.c	2008-10-24 15:37:35 UTC (rev 1472)
+++ branches/rel_1_0/src/gateway/osrf_http_translator.c	2008-10-24 16:30:33 UTC (rev 1473)
@@ -437,7 +437,8 @@
 	osrfConnected = 1;
 
     // at pool destroy time (= child exit time), cleanup
-    apr_pool_cleanup_register(p, NULL, childExit, NULL);
+    // XXX causes us to disconnect even for clone()'d process cleanup (as in mod_cgi)
+    //apr_pool_cleanup_register(p, NULL, childExit, apr_pool_cleanup_null);
 }
 
 static int handler(request_rec *r) {

Modified: branches/rel_1_0/src/gateway/osrf_json_gateway.c
===================================================================
--- branches/rel_1_0/src/gateway/osrf_json_gateway.c	2008-10-24 15:37:35 UTC (rev 1472)
+++ branches/rel_1_0/src/gateway/osrf_json_gateway.c	2008-10-24 16:30:33 UTC (rev 1473)
@@ -99,7 +99,8 @@
 
     // when this pool is cleaned up, it means the child 
     // process is going away.  register some cleanup code
-    apr_pool_cleanup_register(p, NULL, child_exit, NULL);
+    // XXX causes us to disconnect even for clone()'d process cleanup (as in mod_cgi)
+    //apr_pool_cleanup_register(p, NULL, child_exit, apr_pool_cleanup_null);
 }
 
 static int osrf_json_gateway_method_handler (request_rec *r) {