Author: mturk
Date: Tue Feb 17 16:37:13 2009
New Revision: 745136
URL: http://svn.apache.org/viewvc?rev=745136&view=rev
Log:
Make jk_apr_pool as subpool of httpd's conf pool.
This allows to clear the pool and make memory consumption constant for multiple
jk_resolve calls
Modified:
tomcat/connectors/trunk/jk/native/common/jk_connect.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_connect.c?rev=745136&r1=745135&r2=745136&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_connect.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_connect.c Tue Feb 17 16:37:13
2009
@@ -343,12 +343,13 @@
apr_sockaddr_t *remote_sa, *temp_sa;
char *remote_ipaddr;
- if (!(jk_apr_pool = (apr_pool_t *)pool)) {
- if (apr_pool_create(&jk_apr_pool, NULL) != APR_SUCCESS) {
+ if (!jk_apr_pool) {
+ if (apr_pool_create(&jk_apr_pool, (apr_pool_t *)pool) !=
APR_SUCCESS) {
JK_TRACE_EXIT(l);
return JK_FALSE;
}
}
+ apr_pool_clear(jk_apr_pool);
if (apr_sockaddr_info_get
(&remote_sa, host, APR_UNSPEC, (apr_port_t) port, 0, jk_apr_pool)
!= APR_SUCCESS) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
