allow other headers in http send file

Signed-off-by: Andy Green <andy.green@linaro.org>

changelog

 Changelog
 ---------
 
+(since v1.23)
+
+User api changes
+----------------
+
+Extra optional argument to libwebsockets_serve_http_file() allows injecion
+of HTTP headers into the canned response.  Eg, cookies may be added like
+that without getting involved in having to send the header by hand.
+
+
+
 v1.23-chrome32-firefox24
 ========================
 

lib/libwebsockets.h

@@ -922,7 +922,7 @@ libwebsocket_write(struct libwebsocket *wsi, unsigned char *buf, size_t len,
 LWS_VISIBLE LWS_EXTERN int
 libwebsockets_serve_http_file(struct libwebsocket_context *context,
 			struct libwebsocket *wsi, const char *file,
-						     const char *content_type);
+			const char *content_type, const char *other_headers);
 LWS_VISIBLE LWS_EXTERN int
 libwebsockets_serve_http_file_fragment(struct libwebsocket_context *context,
 			struct libwebsocket *wsi);

lib/output.c

@@ -648,6 +648,7 @@ LWS_VISIBLE int libwebsockets_serve_http_file_fragment(
  * @wsi:		Websocket instance (available from user callback)
  * @file:		The file to issue over http
  * @content_type:	The http content type, eg, text/html
+ * @other_headers:	NULL or pointer to \0-terminated other header string
  *
  *	This function is intended to be called from the callback in response
  *	to http requests from the client.  It allows the callback to issue
@@ -659,13 +660,15 @@ LWS_VISIBLE int libwebsockets_serve_http_file_fragment(
  *	the wsi should be left alone.
  */
 
-LWS_VISIBLE int libwebsockets_serve_http_file(struct libwebsocket_context *context,
+LWS_VISIBLE int libwebsockets_serve_http_file(
+		struct libwebsocket_context *context,
 			struct libwebsocket *wsi, const char *file,
-						       const char *content_type)
+			   const char *content_type, const char *other_headers)
 {
 	struct stat stat_buf;
 	unsigned char *p = context->service_buffer;
 	int ret = 0;
+	int n;
 
 	wsi->u.http.fd = open(file, O_RDONLY
 #ifdef WIN32
@@ -691,6 +694,11 @@ LWS_VISIBLE int libwebsockets_serve_http_file(struct libwebsocket_context *conte
 	p += sprintf((char *)p,
 "HTTP/1.0 200 OK\x0d\x0aServer: libwebsockets\x0d\x0a""Content-Type: %s\x0d\x0a",
 								  content_type);
+	if (other_headers) {
+		n = strlen(other_headers);
+		memcpy(p, other_headers, n);
+		p += n;
+	}
 	p += sprintf((char *)p,
 		"Content-Length: %u\x0d\x0a\x0d\x0a",
 					(unsigned int)stat_buf.st_size);

test-server/test-server.c

@@ -201,7 +201,7 @@ static int callback_http(struct libwebsocket_context *context,
 
 		sprintf(buf, "%s%s", resource_path, whitelist[n].urlpath);
 
-		if (libwebsockets_serve_http_file(context, wsi, buf, whitelist[n].mimetype))
+		if (libwebsockets_serve_http_file(context, wsi, buf, whitelist[n].mimetype, NULL))
 			return -1; /* through completion or error, close the socket */
 
 		/*