[GNUnet-SVN] r29377 - in libmicrohttpd: . src/include src/microhttpd src/testcurl

[gnunet]

Author: grothoff
Date: 2013-09-18 15:13:59 +0200 (Wed, 18 Sep 2013)
New Revision: 29377

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/microhttpd/connection.c
   libmicrohttpd/src/testcurl/test_get.c
   libmicrohttpd/src/testcurl/test_parse_cookies.c
Log:
add another standard header

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2013-09-18 13:12:00 UTC (rev 29376)
+++ libmicrohttpd/ChangeLog     2013-09-18 13:13:59 UTC (rev 29377)
@@ -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
 

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2013-09-18 13:12:00 UTC (rev 
29376)
+++ libmicrohttpd/src/include/microhttpd.h      2013-09-18 13:13:59 UTC (rev 
29377)
@@ -121,7 +121,7 @@
  * 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 @@
 #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 */
 

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2013-09-18 13:12:00 UTC (rev 
29376)
+++ libmicrohttpd/src/microhttpd/connection.c   2013-09-18 13:13:59 UTC (rev 
29377)
@@ -1470,7 +1470,7 @@
                   , 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)

Modified: libmicrohttpd/src/testcurl/test_get.c
===================================================================
--- libmicrohttpd/src/testcurl/test_get.c       2013-09-18 13:12:00 UTC (rev 
29376)
+++ libmicrohttpd/src/testcurl/test_get.c       2013-09-18 13:13:59 UTC (rev 
29377)
@@ -401,7 +401,7 @@
   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)

Modified: libmicrohttpd/src/testcurl/test_parse_cookies.c
===================================================================
--- libmicrohttpd/src/testcurl/test_parse_cookies.c     2013-09-18 13:12:00 UTC 
(rev 29376)
+++ libmicrohttpd/src/testcurl/test_parse_cookies.c     2013-09-18 13:13:59 UTC 
(rev 29377)
@@ -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