fix some problem with http server

1). I didn't implemented persisted connection, therefore, it is not 1.1; 2). I didn't end most of the responses properly with \n
alaeri · Mar 7, 2014 · fad6adb · fad6adb
1 parent e20a0a1
commit fad6adb
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/serve/bbf.c b/serve/bbf.c
@@ -188,7 +188,7 @@ int uri_bbf_detect_objects(const void* context, const void* parsed, ebb_buf* buf
 			data[buf->written - 1] = (i == seq->rnum - 1) ? ']' : ',';
 		}
 		char http_header[192];
-		snprintf(http_header, 192, ebb_http_header, buf->written);
+		snprintf(http_header, 192, ebb_http_header, buf->written + 1);
 		size_t len = strnlen(http_header, 192);
 		if (buf->written + len + 1 >= buf->len)
 		{

diff --git a/serve/convnet.c b/serve/convnet.c
@@ -230,7 +230,7 @@ int uri_convnet_classify(const void* context, const void* parsed, ebb_buf* buf)
 	}
 	// copy the http header
 	char http_header[192];
-	snprintf(http_header, 192, ebb_http_header, buf->written);
+	snprintf(http_header, 192, ebb_http_header, buf->written + 1);
 	size_t len = strnlen(http_header, 192);
 	if (buf->written + len + 1 >= buf->len)
 	{

diff --git a/serve/dpm.c b/serve/dpm.c
@@ -210,7 +210,7 @@ int uri_dpm_detect_objects(const void* context, const void* parsed, ebb_buf* buf
 			data[buf->written - 1] = (i == seq->rnum - 1) ? ']' : ',';
 		}
 		char http_header[192];
-		snprintf(http_header, 192, ebb_http_header, buf->written);
+		snprintf(http_header, 192, ebb_http_header, buf->written + 1);
 		size_t len = strnlen(http_header, 192);
 		if (buf->written + len + 1 >= buf->len)
 		{

diff --git a/serve/icf.c b/serve/icf.c
@@ -183,7 +183,7 @@ int uri_icf_detect_objects(const void* context, const void* parsed, ebb_buf* buf
 			data[buf->written - 1] = (i == seq->rnum - 1) ? ']' : ',';
 		}
 		char http_header[192];
-		snprintf(http_header, 192, ebb_http_header, buf->written);
+		snprintf(http_header, 192, ebb_http_header, buf->written + 1);
 		size_t len = strnlen(http_header, 192);
 		if (buf->written + len + 1 >= buf->len)
 		{

diff --git a/serve/sift.c b/serve/sift.c
@@ -188,7 +188,7 @@ int uri_sift(const void* context, const void* parsed, ebb_buf* buf)
 			f32 += 128;
 		}
 		char http_header[192];
-		snprintf(http_header, 192, ebb_http_header, buf->written);
+		snprintf(http_header, 192, ebb_http_header, buf->written + 1);
 		size_t len = strnlen(http_header, 192);
 		if (buf->written + len + 1 >= buf->len)
 		{

diff --git a/serve/swt.c b/serve/swt.c
@@ -244,7 +244,7 @@ int uri_swt_detect_words(const void* context, const void* parsed, ebb_buf* buf)
 			data[buf->written - 1] = (i == seq->rnum - 1) ? ']' : ',';
 		}
 		char http_header[192];
-		snprintf(http_header, 192, ebb_http_header, buf->written);
+		snprintf(http_header, 192, ebb_http_header, buf->written + 1);
 		size_t len = strnlen(http_header, 192);
 		if (buf->written + len + 1 >= buf->len)
 		{

diff --git a/serve/uri.c b/serve/uri.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 #include <stdio.h>
 
-const char ebb_http_header[] = "HTTP/1.1 201 Created\r\nCache-Control: no-cache\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: %zd\r\n\r\n";
+const char ebb_http_header[] = "HTTP/1.0 201 Created\r\nCache-Control: no-cache\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: %zd\r\n\r\n";
 
 void uri_ebb_buf_free(ebb_buf* buf)
 {

diff --git a/serve/uri.h b/serve/uri.h
@@ -5,10 +5,10 @@
 #include <stddef.h>
 
 /* have to be static const char so that can use sizeof */
-static const char ebb_http_404[] = "HTTP/1.1 404 Not Found\r\nCache-Control: no-cache\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 6\r\n\r\nfalse\n";
-static const char ebb_http_empty_object[] = "HTTP/1.1 201 Created\r\nCache-Control: no-cache\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 3\r\n\r\n{}\n";
-static const char ebb_http_empty_array[] = "HTTP/1.1 201 Created\r\nCache-Control: no-cache\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 3\r\n\r\n[]\n";
-static const char ebb_http_ok_true[] = "HTTP/1.1 200 OK\r\nCache-Control: no-cache\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 5\r\n\r\ntrue\n";
+static const char ebb_http_404[] = "HTTP/1.0 404 Not Found\r\nCache-Control: no-cache\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 6\r\n\r\nfalse\n";
+static const char ebb_http_empty_object[] = "HTTP/1.0 201 Created\r\nCache-Control: no-cache\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 3\r\n\r\n{}\n";
+static const char ebb_http_empty_array[] = "HTTP/1.0 201 Created\r\nCache-Control: no-cache\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 3\r\n\r\n[]\n";
+static const char ebb_http_ok_true[] = "HTTP/1.0 200 OK\r\nCache-Control: no-cache\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 5\r\n\r\ntrue\n";
 /* we should never sizeof ebb_http_header */
 extern const char ebb_http_header[];