Commit c8644d1f authored by Peter Wu's avatar Peter Wu Committed by Daniel Stenberg
Browse files

tool: add --unix-socket option 



Signed-off-by: default avatarPeter Wu <peter@lekensteyn.nl>
parent 970c22f9

src/tool_cfgable.c

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ static void free_config_fields(struct OperationConfig *config) 


  Curl_safefree(config->xoauth2_bearer);



  Curl_safefree(config->unix_socket_path);

  Curl_safefree(config->writeout);



  curl_slist_free_all(config->quote);

src/tool_cfgable.h

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ struct OperationConfig { 
  char *xoauth2_bearer;       /* XOAUTH2 bearer token */

  bool nonpn;                 /* enable/disable TLS NPN extension */

  bool noalpn;                /* enable/disable TLS ALPN extension */

  char *unix_socket_path;     /* path to UNIX domain socket */



  struct GlobalConfig *global;

  struct OperationConfig *prev;

src/tool_getparam.c

+4 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ static const struct LongShort aliases[]= { 
  {"$J", "metalink",                 FALSE},

  {"$K", "sasl-ir",                  FALSE},

  {"$L", "test-event",               FALSE},

  {"$M", "unix-socket",              TRUE},

  {"0",   "http1.0",                 FALSE},

  {"01",  "http1.1",                 FALSE},

  {"02",  "http2",                   FALSE},
@@ -976,6 +977,9 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ 
        warnf(config, "--test-event is ignored unless a debug build!\n");

#endif

        break;

      case 'M': /* --unix-socket */

        GetStr(&config->unix_socket_path, nextarg);

        break;

      }

      break;

    case '#': /* --progress-bar */

src/tool_help.c

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ static const char *const helptext[] = { 
  "     --tlsuser USER  TLS username",

  "     --tlspassword STRING  TLS password",

  "     --tlsauthtype STRING  TLS authentication type (default: SRP)",

  "     --unix-socket FILE    Connect through this UNIX domain socket",

  " -A, --user-agent STRING  Send User-Agent STRING to server (H)",

  " -v, --verbose       Make the operation more talkative",

  " -V, --version       Show version number and quit",

src/tool_operate.c

+4 −0
Original line number Diff line number Diff line
@@ -1331,6 +1331,10 @@ static CURLcode operate_do(struct GlobalConfig *global, 
          my_setopt(curl, CURLOPT_SSL_ENABLE_ALPN, 0L);

        }



        /* new in 7.40.0 */

        if(config->unix_socket_path)

          my_setopt(curl, CURLOPT_UNIX_SOCKET_PATH, config->unix_socket_path);



        /* initialize retry vars for loop below */

        retry_sleep_default = (config->retry_delay) ?

          config->retry_delay*1000L : RETRY_SLEEP_DEFAULT; /* ms */