mod_s2s_keepalive: Use timestamp as iq @id RFC 6120 implies that the id attribute must be unique within a stream. This should fix problems with remote servers that enforce uniqueness and don't answer duplicated ids. If it doesn't do that, then at least you can get a guesstimate at round-trip time from the difference between the result iq stanza and the timestamp it was logged without having to go look for when it was sent, or needing to keep state.

2c07bcf56a36d6e74dc0f5422e89bd61f4d31239 0.8-diverge
1656d4fd71d07aa3a52da89d4daf7723a555e7dd last-google-code-commit