From fe4fa4d3c2f47197da462fedbbd3aa364fab2279 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 18 Sep 2013 13:13:59 +0000
Subject: [PATCH] add another standard header

---
 ChangeLog                         | 3 +++
 src/include/microhttpd.h          | 3 ++-
 src/microhttpd/connection.c       | 2 +-
 src/testcurl/test_get.c           | 2 +-
 src/testcurl/test_parse_cookies.c | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 248aeacb..4945f691 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Wed Sep 18 14:31:35 CEST 2013
+	Adding #define MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN. -CG
+
 Tue Sep 17 21:32:47 CEST 2013
 	Also pass MHD connection handle in URI log callback. -CG
 
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 9d9af65d..3d3de5f8 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -121,7 +121,7 @@ extern "C"
  * Current version of the library.
  * 0x01093001 = 1.9.30-1.
  */
-#define MHD_VERSION 0x00093001
+#define MHD_VERSION 0x00093002
 
 /**
  * MHD-internal return code for "YES".
@@ -314,6 +314,7 @@ extern "C"
 #define MHD_HTTP_HEADER_VIA "Via"
 #define MHD_HTTP_HEADER_WARNING "Warning"
 #define MHD_HTTP_HEADER_WWW_AUTHENTICATE "WWW-Authenticate"
+#define MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN "Access-Control-Allow-Origin"
 
 /** @} */ /* end of group headers */
 
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 611ff12f..4e6fed5a 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -1470,7 +1470,7 @@ process_request_body (struct MHD_Connection *connection)
 		   , NULL
 #endif
 		   );
-      if (processed != 0)
+      if (0 != processed)
         instant_retry = MHD_NO; /* client did not process everything */
       used -= processed;
       if (connection->have_chunked_upload == MHD_YES)
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c
index 3795db2a..cbe0e258 100644
--- a/src/testcurl/test_get.c
+++ b/src/testcurl/test_get.c
@@ -401,7 +401,7 @@ testUnknownPortGet (int poll_flag)
   if (di == NULL)
     return 65536;
 
-  if (0 != getsockname(di->listen_fd, &addr, &addr_len))
+  if (0 != getsockname(di->listen_fd, (struct sockaddr *) &addr, &addr_len))
     return 131072;
 
   if (addr.sin_family != AF_INET)
diff --git a/src/testcurl/test_parse_cookies.c b/src/testcurl/test_parse_cookies.c
index 018f4a0f..2eb178c5 100644
--- a/src/testcurl/test_parse_cookies.c
+++ b/src/testcurl/test_parse_cookies.c
@@ -5,7 +5,7 @@
 
      libmicrohttpd is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      libmicrohttpd is distributed in the hope that it will be useful, but