Attachment #374660 for bug #505934

Lines 1117-1123 Link Here

(-)tomcat/jk/trunk/native/common/jk_ajp_common.c (-1 / +1 lines)
1117	aw->s->connected--;	1117	aw->s->connected--;
1118	}	1118	}
1119	}	1119	}
1120	memcpy(&(aw->worker_inet_addr), &inet_addr, sizeof(inet_addr));	1120	jk_clone_sockaddr(&(aw->worker_inet_addr), &inet_addr);
1121	JK_LEAVE_CS(&aw->cs);	1121	JK_LEAVE_CS(&aw->cs);
1122	}	1122	}





#endif

/** Clone a jk_sockaddr_t
 * @param out     The source structure
 * @param in      The target structure
 */
void jk_clone_sockaddr(jk_sockaddr_t *out, jk_sockaddr_t *in)
{
    memcpy(out, in, sizeof(*in));
    /* The ipaddr_ptr member points to memory inside the struct.
     * Do not copy the pointer but use the same offset relative
     * to the struct start
     */
    out->ipaddr_ptr = (void *)out + (in->ipaddr_ptr - (void *)in);
}

/** Resolve the host IP
 * @param host     host or ip address
 * @param port     port
    }

Lines 38-43 Link Here

(-)tomcat/jk/trunk/native/common/jk_connect.h (+2 lines)
38		38
39	#define JK_SOCKET_EOF (-2)	39	#define JK_SOCKET_EOF (-2)
40		40
		41	void jk_clone_sockaddr(jk_sockaddr_t out, jk_sockaddr_t in);
		42
41	int jk_resolve(const char host, int port, jk_sockaddr_t rc, void *pool,	43	int jk_resolve(const char host, int port, jk_sockaddr_t rc, void *pool,
42	int prefer_ipv6, jk_logger_t *l);	44	int prefer_ipv6, jk_logger_t *l);
43		45

Lines 3390-3396 Link Here

(-)tomcat/jk/trunk/native/common/jk_status.c (-1 / +1 lines)
3390	/* This is not atomic and not thread safe */	3390	/* This is not atomic and not thread safe */
3391	aw->port = port;	3391	aw->port = port;
3392	strncpy(aw->host, host, JK_SHM_STR_SIZ);	3392	strncpy(aw->host, host, JK_SHM_STR_SIZ);
3393	memcpy(&(aw->worker_inet_addr), &inet_addr, sizeof(inet_addr));	3393	jk_clone_sockaddr(&(aw->worker_inet_addr), &inet_addr);
3394	*side_effect \|= JK_STATUS_NEEDS_PUSH \| JK_STATUS_NEEDS_ADDR_PUSH;	3394	*side_effect \|= JK_STATUS_NEEDS_PUSH \| JK_STATUS_NEEDS_ADDR_PUSH;
3395	}	3395	}
3396	}	3396	}




  new documentation project for JK was started.
  </p>
</section>
<section name="Changes between 1.2.39 and 1.2.40">
  <br />
  <subsection name="Native">
    <changelog>
      <fix>
        Fix status worker display of worker IP address after name or port
        was changed. (rjung)
      </fix>
    </changelog>
  </subsection>
<section name="Changes between 1.2.37 and 1.2.39">
  <br />
  <subsection name="Native">

Return to bug 505934

Lines 328-333 Link Here

(-)tomcat/jk/trunk/native/common/jk_connect.c (+14 lines)
328		328
329	#endif	329	#endif
330		330
		331	/** Clone a jk_sockaddr_t
		332	* @param out The source structure
		333	* @param in The target structure
		334	*/
		335	void jk_clone_sockaddr(jk_sockaddr_t out, jk_sockaddr_t in)
		336	{
		337	memcpy(out, in, sizeof(*in));
		338	/* The ipaddr_ptr member points to memory inside the struct.
		339	* Do not copy the pointer but use the same offset relative
		340	* to the struct start
		341	*/
		342	out->ipaddr_ptr = (void )out + (in->ipaddr_ptr - (void )in);
		343	}
		344
331	/** Resolve the host IP	345	/** Resolve the host IP
332	* @param host host or ip address	346	* @param host host or ip address
333	* @param port port	347	* @param port port
334	}	348	}

Lines 40-45 Link Here

(-)tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (+10 lines)
40	new documentation project for JK was started.	40	new documentation project for JK was started.
41	</p>	41	</p>
42	</section>	42	</section>
		43	<section name="Changes between 1.2.39 and 1.2.40">
		44	<br />
		45	<subsection name="Native">
		46	<changelog>
		47	<fix>
		48	Fix status worker display of worker IP address after name or port
		49	was changed. (rjung)
		50	</fix>
		51	</changelog>
		52	</subsection>
43	<section name="Changes between 1.2.37 and 1.2.39">	53	<section name="Changes between 1.2.37 and 1.2.39">
44	<br />	54	<br />
45	<subsection name="Native">	55	<subsection name="Native">