Author: mturk
Date: Mon Apr 7 11:00:06 2014
New Revision: 1585452
URL: http://svn.apache.org/r1585452
Log:
Bz56352: Fix regression in memory free
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1585452&r1=1585451&r2=1585452&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Mon Apr 7 11:00:06 2014
@@ -481,16 +481,17 @@ int jk_resolve(const char *host, int por
}
}
}
- freeaddrinfo(ai_list);
if (ai == NULL) {
/* No address found
* XXX: Use better error code?
*/
+ freeaddrinfo(ai_list);
JK_TRACE_EXIT(l);
errno = ENOENT;
return JK_FALSE;
}
memcpy(&(saddr->sa), ai->ai_addr, ai->ai_addrlen);
+ freeaddrinfo(ai_list);
#else /* HAVE_GETADDRINFO */
struct hostent *hoste;
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1585452&r1=1585451&r2=1585452&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Mon Apr 7 11:00:06 2014
@@ -45,6 +45,9 @@
<subsection name="Native">
<changelog>
<fix>
+ <bug>56352</bug>: Fix regression in memory release. (mturk)
+ </fix>
+ <fix>
Fix status worker display of worker IP address after name or port
was changed. (rjung)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
