Parcourir la source

Merge pull request #289 from Jonnycake/issue-283

Resolves issue #283.

* Cleaned it up a bit
Bryan Heden il y a 8 ans
Parent
commit
d90be0fe3d
1 fichiers modifiés avec 14 ajouts et 4 suppressions
  1. 14 4
      plugins/check_http.c

+ 14 - 4
plugins/check_http.c

@@ -1217,12 +1217,22 @@ check_http (void)
 
   /* find header info and null-terminate it */
   header = page;
-	for (;;) {
-		if (!*page || !strncmp(page, "\r\n\r\n", 4) || !strncmp(page, "\n\n", 2))
-		 break;
-		while (*page == '\r' || *page == '\n') { ++page; }
+
+  for (;;) {
+    
+    if (!strncmp(page, "\r\n\r\n", 4) || !strncmp(page, "\n\n", 2)) 
+      break;
+    
+    while (*page == '\r' || *page == '\n') { 
+      ++page; 
+    }
+
     page += (size_t) strcspn (page, "\r\n");
     pos = page;
+
+    /* Prevent Issue #283 - check_http: -N parameter causes false timeouts (version 2.2.1) */
+    if(*page == '\0') 
+      break;
   }
   page += (size_t) strspn (page, "\r\n");
   header[pos - header] = 0;