Commit 3b548ffd authored by Patrick Monnerat's avatar Patrick Monnerat
Browse files

setopt: reintroduce non-static Curl_vsetopt() for OS400 support 

This also upgrades ILE/RPG bindings with latest setopt options.

Reported-By: jonrumsey on github
Fixes #2230
Closes #2233
parent fa3dbb9a

lib/setopt.c

+4 −5
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2018, 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
@@ -110,7 +110,7 @@ static CURLcode setstropt_userpwd(char *option, char **userp, char **passwdp) 
#define C_SSLVERSION_VALUE(x) (x & 0xffff)

#define C_SSLVERSION_MAX_VALUE(x) (x & 0xffff0000)



static CURLcode setopt(struct Curl_easy *data, CURLoption option,

CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option,

                      va_list param)

{

  char *argptr;
@@ -2547,9 +2547,8 @@ CURLcode curl_easy_setopt(struct Curl_easy *data, CURLoption tag, ...) 


  va_start(arg, tag);



  result = setopt(data, tag, arg);

  result = Curl_vsetopt(data, tag, arg);



  va_end(arg);

  return result;

}

lib/setopt.h

+3 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2018, 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
@@ -23,5 +23,7 @@ 
 ***************************************************************************/



CURLcode Curl_setstropt(char **charp, const char *s);

CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option,

                      va_list arg);



#endif /* HEADER_CURL_SETOPT_H */

lib/url.h

+1 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2018, 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
@@ -34,8 +34,6 @@ 
CURLcode Curl_init_do(struct Curl_easy *data, struct connectdata *conn);

CURLcode Curl_open(struct Curl_easy **curl);

CURLcode Curl_init_userdefined(struct Curl_easy *data);

CURLcode Curl_setopt(struct Curl_easy *data, CURLoption option,

                     va_list arg);

CURLcode Curl_dupset(struct Curl_easy * dst, struct Curl_easy * src);

void Curl_freeset(struct Curl_easy * data);

CURLcode Curl_close(struct Curl_easy *data); /* opposite of curl_open() */

packages/OS400/README.OS400

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ options: 
        CURLOPT_RANDOM_FILE

        CURLOPT_RANGE

        CURLOPT_REFERER

        CURLOPT_REQUEST_TARGET

        CURLOPT_RTSP_SESSION_UID

        CURLOPT_RTSP_STREAM_URI

        CURLOPT_RTSP_TRANSPORT

packages/OS400/ccsidcurl.c

+5 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2018, 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
@@ -36,6 +36,7 @@ 
#include "slist.h"

#include "urldata.h"

#include "url.h"

#include "setopt.h"

#include "getinfo.h"

#include "ccsidcurl.h"
@@ -1124,7 +1125,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) 
  if(testwarn) {

    testwarn = 0;



    if((int) STRING_LASTZEROTERMINATED != (int) STRING_UNIX_SOCKET_PATH + 1 ||

    if((int) STRING_LASTZEROTERMINATED != (int) STRING_TARGET + 1 ||

       (int) STRING_LAST != (int) STRING_COPYPOSTFIELDS + 1)

      curl_mfprintf(stderr,

       "*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");
@@ -1184,6 +1185,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) 
  case CURLOPT_RANDOM_FILE:

  case CURLOPT_RANGE:

  case CURLOPT_REFERER:

  case CURLOPT_REQUEST_TARGET:

  case CURLOPT_RTSP_SESSION_ID:

  case CURLOPT_RTSP_STREAM_URI:

  case CURLOPT_RTSP_TRANSPORT:
@@ -1287,7 +1289,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) 


  case CURLOPT_ERRORBUFFER:                     /* This is an output buffer. */

  default:

    result = Curl_setopt(data, tag, arg);

    result = Curl_vsetopt(data, tag, arg);

    break;

    }