Author: rjung
Date: Sat May 23 10:29:12 2015
New Revision: 1681314
URL: http://svn.apache.org/r1681314
Log:
Use old (problematic) variant if newer API is
not available.
Modified:
tomcat/native/trunk/native/src/network.c
Modified: tomcat/native/trunk/native/src/network.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/network.c?rev=1681314&r1=1681313&r2=1681314&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/network.c (original)
+++ tomcat/native/trunk/native/src/network.c Sat May 23 10:29:12 2015
@@ -194,8 +194,14 @@ TCN_IMPLEMENT_CALL(jlong, Socket, create
TCN_THROW_IF_ERR(apr_socket_create(&s,
f, t, protocol, c), a);
}
+#ifdef HAVE_POOL_PRE_CLEANUP
apr_pool_pre_cleanup_register(c, (const void *)a,
sp_socket_cleanup);
+#else
+ apr_pool_cleanup_register(c, (const void *)a,
+ sp_socket_cleanup,
+ apr_pool_cleanup_null);
+#endif
#ifdef TCN_DO_STATISTICS
sp_created++;
@@ -388,8 +394,14 @@ TCN_IMPLEMENT_CALL(jlong, Socket, accept
TCN_THROW_IF_ERR(apr_socket_accept(&n, s->sock, p), n);
a->pool = p;
+#ifdef HAVE_POOL_PRE_CLEANUP
apr_pool_pre_cleanup_register(a->pool, (const void *)a,
sp_socket_cleanup);
+#else
+ apr_pool_cleanup_register(a->pool, (const void *)a,
+ sp_socket_cleanup,
+ apr_pool_cleanup_null);
+#endif
}
else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
