moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-03-11 07:39:50 -04:00
Code Issues Releases Wiki Activity

-p/--proxytunnel was added

Browse Source
This commit is contained in:
Daniel Stenberg 2000-09-15 06:11:46 +00:00
parent 0da7057591
commit 96009453e8
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main.c
View File

@ -252,9 +252,7 @@ static void help(void)
" -N/--no-buffer Disables the buffering of the output stream\n" " -N/--no-buffer Disables the buffering of the output stream\n"
" -o/--output <file> Write output to <file> instead of stdout\n" " -o/--output <file> Write output to <file> instead of stdout\n"
" -O/--remote-name Write output to a file named as the remote file\n" " -O/--remote-name Write output to a file named as the remote file\n"
#if 0 " -p/--proxytunnel Perform non-HTTP services through a HTTP proxy\n"
" -p/--port <port> Use port other than default for current protocol.\n"
#endif
" -P/--ftpport <address> Use PORT with address instead of PASV when ftping (F)\n" " -P/--ftpport <address> Use PORT with address instead of PASV when ftping (F)\n"
" -q When used as the first parameter disables .curlrc\n" " -q When used as the first parameter disables .curlrc\n"
" -Q/--quote <cmd> Send QUOTE command to FTP before file transfer (F)\n" " -Q/--quote <cmd> Send QUOTE command to FTP before file transfer (F)\n"
@ -311,6 +309,7 @@ struct Configurable {
char *proxyuserpwd; char *proxyuserpwd;
char *proxy; char *proxy;
bool configread; bool configread;
bool proxytunnel;
long conf; long conf;
char *url; char *url;
char *cert; char *cert;
@ -473,9 +472,7 @@ static int getparameter(char *flag, /* f or -long-flag */
{"N", "no-buffer", FALSE}, {"N", "no-buffer", FALSE},
{"o", "output", TRUE}, {"o", "output", TRUE},
{"O", "remote-name", FALSE}, {"O", "remote-name", FALSE},
#if 0 {"p", "proxytunnel", FALSE},
{"p", "port", TRUE},
#endif
{"P", "ftpport", TRUE}, {"P", "ftpport", TRUE},
{"q", "disable", FALSE}, {"q", "disable", FALSE},
{"Q", "quote", TRUE}, {"Q", "quote", TRUE},
@ -789,15 +786,11 @@ static int getparameter(char *flag, /* f or -long-flag */
*/ */
GetStr(&config->ftpport, nextarg); GetStr(&config->ftpport, nextarg);
break; break;
#if 0
case 'p': case 'p':
/* specified port */ /* proxy tunnel for non-http protocols */
fputs("You've used the -p option, it will be removed in a future version\n", config->proxytunnel ^= TRUE;
stderr);
config->porttouse = atoi(nextarg);
config->conf |= CONF_PORT; /* changed port */
break; break;
#endif
case 'q': /* if used first, already taken care of, we do it like case 'q': /* if used first, already taken care of, we do it like
this so we don't cause an error! */ this so we don't cause an error! */
break; break;
@ -1501,6 +1494,7 @@ int main(int argc, char *argv[])
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, config.customrequest); curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, config.customrequest);
curl_easy_setopt(curl, CURLOPT_STDERR, config.errors); curl_easy_setopt(curl, CURLOPT_STDERR, config.errors);
curl_easy_setopt(curl, CURLOPT_WRITEINFO, config.writeout); curl_easy_setopt(curl, CURLOPT_WRITEINFO, config.writeout);
curl_easy_setopt(curl, CURLOPT_HTTPPROXYTUNNEL, config.proxytunnel);
if((config.progressmode == CURL_PROGRESS_BAR) && if((config.progressmode == CURL_PROGRESS_BAR) &&
!(config.conf&(CONF_NOPROGRESS|CONF_MUTE))) { !(config.conf&(CONF_NOPROGRESS|CONF_MUTE))) {