From 07a2db272e8f37c12ff9a9c5a148e4c15234ddfe Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 24 Oct 2008 16:30:33 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/rel_1_0@1473 9efc2488-bf62-4759-914b-345cdb29e865 --- src/gateway/osrf_http_translator.c | 3 ++- src/gateway/osrf_json_gateway.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gateway/osrf_http_translator.c b/src/gateway/osrf_http_translator.c index 5d2f60a..984acd4 100644 --- a/src/gateway/osrf_http_translator.c +++ b/src/gateway/osrf_http_translator.c @@ -437,7 +437,8 @@ static void childInit(apr_pool_t *p, server_rec *s) { 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) { diff --git a/src/gateway/osrf_json_gateway.c b/src/gateway/osrf_json_gateway.c index c260d81..5bb3f5e 100644 --- a/src/gateway/osrf_json_gateway.c +++ b/src/gateway/osrf_json_gateway.c @@ -99,7 +99,8 @@ static void osrf_json_gateway_child_init(apr_pool_t *p, server_rec *s) { // 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) { -- 2.11.0