Changes committed to git://oss.sgi.com/pcp/pcp.git nssmerge
qa/.gitignore | 1 +
qa/041 | 16 ++++++++++------
qa/041.out | 36 ------------------------------------
qa/041.out.1 | 36 ++++++++++++++++++++++++++++++++++++
qa/041.out.2 | 36 ++++++++++++++++++++++++++++++++++++
src/libpcp/src/logconnect.c | 35 ++++++++++++++++++++++++++++++-----
src/pmcd/src/config.c | 10 +++++-----
7 files changed, 118 insertions(+), 52 deletions(-)
commit 5d976a7ad4c84ee86df1b88bde63d4ecaf3bc7a1
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Nov 26 09:18:36 2012 +1100
Compat output for test 041, timeout error not overridden in libpcp now
commit 5e89bd5bfb4cce799bb31aff4be69ffa0fe3d520
Merge: ce7371d 3ea1db6
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Nov 26 08:57:03 2012 +1100
Merge branch 'brolley/nssmerge' of git://sourceware.org/git/pcpfans into
nssmerge
commit 3ea1db6d154187318a2be9a94f6e13896bc5b0a3
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Fri Nov 23 14:28:57 2012 -0500
Handle EINPROGRESS status from PR_Connect.
NSPR manages all file descriptors in nonblocking mode, so it
is possible to get PR_FAILURE from PR_Connect when connecting to
a socket with oserror() returning EINPROGRESS. In this case,
the client must wait for the socket using __pmSelect{Read,WRite}
and then call __pmConnectCheckError in order to determine
whether the connection was successful.
This fixes qa test case 439 for NSS/NSPR enabled builds.
commit ed3fc6cc8b043a896146b1e6466f060dceaacc7a
Author: Dave Brolley <brolley@xxxxxxxxxx>
Date: Thu Nov 22 15:20:41 2012 -0500
Fix pmcd crash in ParseRestartAgents with NSS/NSPR enabled.
The function was not using the __pm* socket I/O api.
Fixes qa test case failures for 067, 110 and 156 with NSS enabled.
|