consolidate HTTP/x.x token parsing and remove level 1 debug()

diff --git a/src/client_side.cc b/src/client_side.cc
index ca9954b78d4250bf30a9d3269077eb9a3181a12d..57d8c08792107d30c926e93bec94ed74edef6e03 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.153 1997/11/18 00:47:59 wessels Exp $
+ * $Id: client_side.cc,v 1.154 1997/11/19 06:16:33 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -1381,27 +1381,13 @@ parseHttpRequest(ConnStateData * conn, method_t * method_p, int *status,
 
     token = strtok(NULL, null_string);
     for (t = token; t && *t && *t != '\n' && *t != '\r'; t++);
-    if (t == NULL || *t == '\0' || t == token) {
+    if (t == NULL || *t == '\0' || t == token || strncmp(token, "HTTP/", 5)) {
        debug(12, 3) ("parseHttpRequest: Missing HTTP identifier\n");
        xfree(inbuf);
        *status = -1;
        return NULL;
     }
-#ifdef SSCANF_GIVING_ME_TROUBLE
-    memset(http_ver_s, '\0', 32);
-    xstrncpy(http_ver_s, token, 32);
-    sscanf(http_ver_s, "HTTP/%f", &http_ver);
-    debug(12, 5) ("parseHttpRequest: HTTP version is '%3.1f'\n", http_ver);
-#else
-    if (strncmp(token, "HTTP/", 5)) {
-       debug(12, 1) ("parseHttpRequest: Missing HTTP identifier ('%s')\n",
-           token);
-       xfree(inbuf);
-       *status = -1;
-       return NULL;
-    }
     http_ver = (float) atof(token + 5);
-#endif
 
     /* Check if headers are received */
     if ((end = mime_headers_end(t)) == NULL) {