Base code merged to SPIN 2.4

[platform/upstream/curl.git] / packages / OS400 / curl.inc.in

diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 565df61..fcbf7c7 100644 (file)
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -5,7 +5,7 @@
       *                            | (__| |_| |  _ <| |___
       *                             \___|\___/|_| \_\_____|
       *
-      * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+      * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
       *
       * This software is licensed as described in the file COPYING, which
       * you should have received as part of this distribution. The terms
@@ -94,7 +94,7 @@
      d CURL_VERSION_NTLM...
      d                 c                   X'00000010'
      d CURL_VERSION_GSSNEGOTIATE...
-     d                 c                   X'00000020'
+     d                 c                   X'00000020'                          Deprecated
      d CURL_VERSION_DEBUG...
      d                 c                   X'00000040'
      d CURL_VERSION_ASYNCHDNS...
@@ -117,6 +117,12 @@
      d                 c                   X'00008000'
      d CURL_VERSION_HTTP2...
      d                 c                   X'00010000'
+     d CURL_VERSION_GSSAPI...
+     d                 c                   X'00020000'
+     d CURL_VERSION_KERBEROS5...
+     d                 c                   X'00040000'
+     d CURL_VERSION_UNIX_SOCKETS...
+     d                 c                   X'00080000'
       *
      d HTTPPOST_FILENAME...
      d                 c                   X'00000001'
@@ -152,7 +158,7 @@
      d CURLAUTH_BASIC  c                   X'00000001'
      d CURLAUTH_DIGEST...
      d                 c                   X'00000002'
-     d CURLAUTH_GSSNEGOTIATE...
+     d CURLAUTH_NEGOTIATE...
      d                 c                   X'00000004'
      d CURLAUTH_NTLM   c                   X'00000008'
      d CURLAUTH_DIGEST_IE...
@@ -362,8 +368,7 @@
      d                 c                   14
      d  CURLE_FTP_CANT_GET_HOST...
      d                 c                   15
-     d  CURLE_OBSOLETE16...
-     d                 c                   16
+     d  CURLE_HTTP2    c                   16
      d  CURLE_FTP_COULDNT_SET_TYPE...
      d                 c                   17
      d  CURLE_PARTIAL_FILE...
@@ -510,6 +515,8 @@
      d                 c                   88
      d  CURLE_NO_CONNECTION_AVAILABLE...
      d                 c                   89
+     d  CURLE_SSL_PINNEDPUBKEYNOTMATCH...
+     d                 c                   90
       *
       /if not defined(CURL_NO_OLDIES)
      d  CURLE_URL_MALFORMAT_USER...
@@ -774,6 +781,10 @@
      d                 c                   X'01000000'
      d  CURLPROTO_GOPHER...
      d                 c                   X'02000000'
+     d  CURLPROTO_SMB...
+     d                 c                   X'04000000'
+     d  CURLPROTO_SMBS...
+     d                 c                   X'08000000'
       *
      d CURLoption      s             10i 0 based(######ptr######)               Enum
      d  CURLOPT_WRITEDATA...
@@ -1188,6 +1199,10 @@
      d                 c                   10228
      d  CURLOPT_HEADEROPT...
      d                 c                   00229
+     d  CURLOPT_PINNEDPUBLICKEY...
+     d                 c                   10230
+     d  CURLOPT_UNIX_SOCKET_PATH...
+     d                 c                   10231
       *
       /if not defined(CURL_NO_OLDIES)
      d  CURLOPT_FILE   c                   10001
@@ -1380,7 +1395,7 @@
      d                 c                   2
      d  CURLSSLBACKEND_NSS...
      d                 c                   3
-     d  CURLSSLBACKEND_QSOSSL...
+     d  CURLSSLBACKEND_OBSOLETE4...
      d                 c                   4
      d  CURLSSLBACKEND_GSKIT...
      d                 c                   5