From 189eded1cc70c80880c2923a25b3d79dd4eb2efd Mon Sep 17 00:00:00 2001
From: Ben Pirt <ben@pirt.co.uk>
Date: Fri, 6 Mar 2015 09:48:58 +0000
Subject: [PATCH] Add support for extracting the multipart form boundary for
 later use by cgi

---
 user/httpd.c | 13 +++++++++++++
 user/httpd.h |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/user/httpd.c b/user/httpd.c
index b047881..79ae2c8 100644
--- a/user/httpd.c
+++ b/user/httpd.c
@@ -376,6 +376,17 @@ static void ICACHE_FLASH_ATTR httpdParseHeader(char *h, HttpdConnData *conn) {
 			conn->postBuff=(char*)os_malloc(conn->postLen+1);
 		}
 		conn->priv->postPos=0;
+	} else if (os_strncmp(h, "Content-Type: ", 14)==0) {
+		if(os_strstr(h, "multipart/form-data")){
+			// It's multipart form data so let's pull out the boundary for future use
+			char *b;
+			if((b = os_strstr(h, "boundary=")) != NULL){
+				conn->multipartBoundary = b + 7; // move the pointer 2 chars before boundary then fill them with dashes
+				conn->multipartBoundary[0] = '-';
+				conn->multipartBoundary[1] = '-';
+				os_printf("boundary = %s\n", conn->multipartBoundary);
+			}
+		}
 	}
 }
 
@@ -423,6 +434,7 @@ static void ICACHE_FLASH_ATTR httpdRecvCb(void *arg, char *data, unsigned short
 			if (conn->priv->postPos>=conn->postLen) {
 				//Received post stuff.
 				conn->postBuff[conn->priv->postPos]=0; //zero-terminate
+				conn->postBuffLen = conn->priv->postPos;
 				conn->priv->postPos=-1;
 				os_printf("Post data: %s\n", conn->postBuff);
 				//Send the response.
@@ -434,6 +446,7 @@ static void ICACHE_FLASH_ATTR httpdRecvCb(void *arg, char *data, unsigned short
 
 	if(conn->priv->postPos > 0 && conn->stream){
 		conn->postBuff[conn->priv->postPos]=0; //zero-terminate
+		conn->postBuffLen = conn->priv->postPos;
 		r=conn->cgi(conn);
 		if (r!=HTTPD_CGI_NOTFOUND) {
 			if (r==HTTPD_CGI_DONE){
diff --git a/user/httpd.h b/user/httpd.h
index 91e8e48..082f4ca 100644
--- a/user/httpd.h
+++ b/user/httpd.h
@@ -28,9 +28,11 @@ struct HttpdConnData {
 	char *getArgs;
 	const void *cgiArg;
 	void *cgiData;
+	char *multipartBoundary;
 	HttpdPriv *priv;
 	cgiSendCallback cgi;
 	int postLen;
+	int postBuffLen;
 	int postReceived;
 	char *postBuff;
 	int stream;