Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge
qa/067 | 2 +-
qa/131 | 3 ++-
qa/200 | 1 +
qa/273 | 1 +
qa/294 | 2 +-
qa/295 | 2 +-
src/libpcp/src/connect.c | 2 +-
7 files changed, 8 insertions(+), 5 deletions(-)
commit ccd1b3c4091bf46c511a2bac042f366fc0c182b7
Merge: 0196f89 e63ba4a
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Tue Nov 20 14:54:39 2012 +1100
Merge dev branch back into nssmerge
commit 0196f89385420d184ca6c7f7f6a175a78cd7a1fe
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Mon Nov 19 16:13:38 2012 -0500
Rework regexp which filters fd numbers.
commit cb4d5a3fa62e5d58d3a51460df2e9157120b9657
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Mon Nov 19 16:10:38 2012 -0500
Filter __pmDataIPC messages which only occur when NSS/NSPR is enabled.
commit 854d770abff3525e1a8c2bb276f7ed814b081c1d
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Mon Nov 19 16:09:36 2012 -0500
Fix intermittent failure of test qa/131.
If the initial connection timed out (as expected) all was well.
However, sometimes the connection was successful and the handshake
would time out. In this case, pminfo reported an IPC protocol
failure. This was because __pmConnectHandshake did not
propagate the PM_ERR_TIMEOUT from __pmGetPDU to the caller and
instead was retuning PM_ERR_IPC for all errors except PDU_ERROR.
__pmConnectHandshake now propagates the PM_ERR_TIMEOUT. The test
script has been enhanced to handle the message which occurs when
this happens.
|