From: <no...@so...> - 2009-09-12 14:31:00
|
Update of /cvsroot/ijbswa/current In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13444 Modified Files: jcc.c Log Message: Turn mark_server_socket_tainted() into a nop if the server socket is already tainted. Tainting it twice doesn't hurt, but logging the same message twice is pointless. Index: jcc.c =================================================================== RCS file: /cvsroot/ijbswa/current/jcc.c,v retrieving revision 1.290 retrieving revision 1.291 diff -u -d -r1.290 -r1.291 --- jcc.c 12 Sep 2009 12:32:26 -0000 1.290 +++ jcc.c 12 Sep 2009 12:35:14 -0000 1.291 @@ -1231,7 +1231,8 @@ *********************************************************************/ static void mark_server_socket_tainted(struct client_state *csp) { - if ((csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE)) + if ((csp->flags & CSP_FLAG_SERVER_CONNECTION_KEEP_ALIVE) + && !(csp->flags |= CSP_FLAG_SERVER_SOCKET_TAINTED)) { log_error(LOG_LEVEL_CONNECT, "Marking the server socket %d tainted.", csp->sfd); |