Merge branch 'master' of mhzoctdev.maiman:/srv/git/mhzoct/picoweb

2 files changed, 3 insertions, 6 deletions

diff --git a/picohttp.c b/picohttp.c
index 0e6a360..84e0238 100644
--- a/picohttp.c
+++ b/picohttp.c
@@ -1071,7 +1071,7 @@ int picohttpResponseSendHeaders (
 int picohttpResponseWrite (
 	struct picohttpRequest * const req,
 	size_t len,
-	char const *buf )
+	void const *buf )
 {
 	int e;
 
@@ -1159,14 +1159,11 @@ replay:
 			} else {
 				if( mp->in_boundary ) 
 				{
-#if 1
 					if( '\r' == ch ) {
 						mp->replay = mp->in_boundary-1;
 						mp->mismatch = mp->req->query.multipartboundary[mp->replay];
 						mp->in_boundary = 1;
-					} else 
-#endif
-					{
+					} else {
 						mp->mismatch = ch;
 						mp->replay = mp->in_boundary;
 						mp->in_boundary = 0;
diff --git a/picohttp.h b/picohttp.h
index 644761f..83cb5f2 100644
--- a/picohttp.h
+++ b/picohttp.h
@@ -170,7 +170,7 @@ int picohttpResponseSendHeader (
 int picohttpResponseWrite (
 	struct picohttpRequest * const req,
 	size_t len,
-	char const *buf );
+	void const *buf );
 
 int picohttpGetch(struct picohttpRequest * const req);