components/libmicrohttpd/patches/002.patch
author Craig Mohrman <craig.mohrman@oracle.com>
Fri, 09 Oct 2015 09:55:13 -0700
branchs11u3-sru
changeset 4936 79af241b4834
parent 4142 ac544f9e49ee
permissions -rw-r--r--
21843191 squid upgrade in 21305852 dropped password by accident
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4142
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
     1
Tomas Heran <[email protected]>
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
     2
Make MHD_http_unescape available to library users.
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
     3
Reported upstream as: https://gnunet.org/bugs/view.php?id=3585
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
     4
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
     5
diff -r dcb95cb7b865 -r efe4a6fcacd1 src/include/microhttpd.h
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
     6
--- a/src/include/microhttpd.h	Thu Dec 18 21:16:20 2014 +0100
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
     7
+++ b/src/include/microhttpd.h	Thu Dec 18 21:49:28 2014 +0100
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
     8
@@ -2477,6 +2477,21 @@
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
     9
 _MHD_EXTERN int
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    10
 MHD_is_feature_supported(enum MHD_FEATURE feature);
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    11
 
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    12
+/**
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    13
+ * Process escape sequences ('+'=space, %HH) Updates val in place; the
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    14
+ * result should be UTF-8 encoded and cannot be larger than the input.
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    15
+ * The result must also still be 0-terminated.
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    16
+ *
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    17
+ * @param cls closure (use NULL)
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    18
+ * @param connection handle to connection, not used
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    19
+ * @param val value to unescape (modified in the process)
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    20
+ * @return length of the resulting val (strlen(val) maybe
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    21
+ *  shorter afterwards due to elimination of escape sequences)
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    22
+ */
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    23
+size_t
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    24
+MHD_http_unescape (void *cls,
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    25
+		   struct MHD_Connection *connection,
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    26
+		   char *val);
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    27
 
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    28
 #if 0                           /* keep Emacsens' auto-indent happy */
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    29
 {
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    30
diff -r dcb95cb7b865 -r efe4a6fcacd1 src/microhttpd/internal.h
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    31
--- a/src/microhttpd/internal.h	Thu Dec 18 21:16:20 2014 +0100
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    32
+++ b/src/microhttpd/internal.h	Thu Dec 18 21:49:28 2014 +0100
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    33
@@ -200,23 +200,6 @@
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    34
 #endif
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    35
 
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    36
 /**
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    37
- * Process escape sequences ('+'=space, %HH) Updates val in place; the
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    38
- * result should be UTF-8 encoded and cannot be larger than the input.
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    39
- * The result must also still be 0-terminated.
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    40
- *
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    41
- * @param cls closure (use NULL)
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    42
- * @param connection handle to connection, not used
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    43
- * @param val value to unescape (modified in the process)
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    44
- * @return length of the resulting val (strlen(val) maybe
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    45
- *  shorter afterwards due to elimination of escape sequences)
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    46
- */
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    47
-size_t
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    48
-MHD_http_unescape (void *cls,
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    49
-		   struct MHD_Connection *connection,
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    50
-		   char *val);
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    51
-
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    52
-
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    53
-/**
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    54
  * Header or cookie in HTTP request or response.
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    55
  */
ac544f9e49ee PSARC/2014/289 libmicrohttpd
Tomas Heran <tomas.heran@oracle.com>
parents:
diff changeset
    56
 struct MHD_HTTP_Header