[Nagiosplug-checkins] CVS: nagiosplug/plugins check_http.c,1.24.2.1,1.24.2.2

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv10125/plugins

Modified Files:
      Tag: r1_3_0
	check_http.c 
Log Message:
fix error when server closes connection immediately

Index: check_http.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C2 -r1.24.2.1 -r1.24.2.2
*** check_http.c	23 Apr 2003 04:57:08 -0000	1.24.2.1
--- check_http.c	9 May 2003 03:22:37 -0000	1.24.2.2
***************
*** 628,641 ****
  	}
  
! 	if (i < 0) {
  #ifdef HAVE_SSL
! 		sslerr=SSL_get_error(ssl, i);
! 		if ( sslerr == SSL_ERROR_SSL ) {
! 			terminate (STATE_WARNING, "Client Certificate Required\n");
! 		} else {
  			terminate (STATE_CRITICAL, "Error in recv()");
  		}
- #else
- 		terminate (STATE_CRITICAL, "Error in recv()");
  #endif
  	}
--- 628,646 ----
  	}
  
! 	if (i < 0 && errno != ECONNRESET) {
  #ifdef HAVE_SSL
! 		if (use_ssl) {
! 			sslerr=SSL_get_error(ssl, i);
! 			if ( sslerr == SSL_ERROR_SSL ) {
! 				terminate (STATE_WARNING, "Client Certificate Required\n");
! 			} else {
! 				terminate (STATE_CRITICAL, "Error in recv()");
! 			}
! 		}
! 		else {
! #endif
  			terminate (STATE_CRITICAL, "Error in recv()");
+ #ifdef HAVE_SSL
  		}
  #endif
  	}