curl: make code work with protocol-disabled libcurl (697b1f91) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

src/tool_operate.c

+12 −5

Original line number	Diff line number	Diff line
		@@ -825,7 +825,9 @@ static CURLcode operate_do(struct GlobalConfig *global,

		/* where to store */
		my_setopt(curl, CURLOPT_WRITEDATA, &outs);
		#ifndef CURL_DISABLE_RTSP
		my_setopt(curl, CURLOPT_INTERLEAVEDATA, &outs);
		#endif
		if(metalink \|\| !config->use_metalink)
		/* what call to write */
		my_setopt(curl, CURLOPT_WRITEFUNCTION, tool_write_cb);
		@@ -1032,8 +1034,9 @@ static CURLcode operate_do(struct GlobalConfig *global,
		my_setopt(curl, CURLOPT_RESUME_FROM_LARGE, CURL_OFF_T_C(0));

		my_setopt_str(curl, CURLOPT_KEYPASSWD, config->key_passwd);
		#ifndef CURL_DISABLE_PROXY
		my_setopt_str(curl, CURLOPT_PROXY_KEYPASSWD, config->proxy_key_passwd);

		#endif
		if(built_in_protos & (CURLPROTO_SCP\|CURLPROTO_SFTP)) {

		/* SSH and SSL private key uses same command-line option */
		@@ -1239,8 +1242,9 @@ static CURLcode operate_do(struct GlobalConfig *global,

		/* three new ones in libcurl 7.3: */
		my_setopt_str(curl, CURLOPT_INTERFACE, config->iface);
		#ifndef CURL_DISABLE_FTP
		my_setopt_str(curl, CURLOPT_KRBLEVEL, config->krblevel);

		#endif
		progressbarinit(&progressbar, config);
		if((global->progressmode == CURL_PROGRESS_BAR) &&
		!global->noprogress && !global->mute) {
		@@ -1262,9 +1266,10 @@ static CURLcode operate_do(struct GlobalConfig *global,
		if(config->dns_ipv6_addr)
		my_setopt_str(curl, CURLOPT_DNS_LOCAL_IP6, config->dns_ipv6_addr);

		#ifndef CURL_DISABLE_TELNET
		/* new in libcurl 7.6.2: */
		my_setopt_slist(curl, CURLOPT_TELNETOPTIONS, config->telnet_options);

		#endif
		/* new in libcurl 7.7: */
		my_setopt_str(curl, CURLOPT_RANDOM_FILE, config->random_file);
		my_setopt_str(curl, CURLOPT_EGDSOCKET, config->egd_file);
		@@ -1367,9 +1372,10 @@ static CURLcode operate_do(struct GlobalConfig *global,
		my_setopt_str(curl, CURLOPT_SERVICE_NAME,
		config->service_name);

		#ifndef CURL_DISABLE_FTP
		/* curl 7.13.0 */
		my_setopt_str(curl, CURLOPT_FTP_ACCOUNT, config->ftp_account);

		#endif
		my_setopt(curl, CURLOPT_IGNORE_CONTENT_LENGTH, config->ignorecl?1L:0L);

		#ifndef CURL_DISABLE_FTP
		@@ -1385,10 +1391,11 @@ static CURLcode operate_do(struct GlobalConfig *global,
		my_setopt_str(curl, CURLOPT_LOCALPORTRANGE, config->localportrange);
		}

		#ifndef CURL_DISABLE_FTP
		/* curl 7.15.5 */
		my_setopt_str(curl, CURLOPT_FTP_ALTERNATIVE_TO_USER,
		config->ftp_alternative_to_user);

		#endif
		/* curl 7.16.0 */
		if(config->disable_sessionid)
		/* disable it */

tests/data/test1400

+2 −1

Original line number	Diff line number	Diff line
		@@ -50,11 +50,13 @@ Accept: /
		<stripfile>
		s/(USERAGENT, \")[^\"]+/${1}stripped/
		# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with
		# CURLOPT_INTERLEAVEDATA requires RTSP protocol
		# configurations - just ignore them
		$_ = '' if /CURLOPT_SSL_VERIFYPEER/
		$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
		$_ = '' if /CURLOPT_HTTP_VERSION/
		$_ = '' if /CURLOPT_HTTP09_ALLOWED/
		$_ = '' if /CURLOPT_INTERLEAVEDATA/
		</stripfile>
		<file name="log/test1400.c" mode="text">
		/******* Sample code generated by the curl command line tool ********
		@@ -81,7 +83,6 @@ int main(int argc, char *argv[])
		them yourself.

		CURLOPT_WRITEDATA set to a objectpointer
		CURLOPT_INTERLEAVEDATA set to a objectpointer
		CURLOPT_WRITEFUNCTION set to a functionpointer
		CURLOPT_READDATA set to a objectpointer
		CURLOPT_READFUNCTION set to a functionpointer

tests/data/test1401

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ X-Men: cyclops, iceman
		$_ = '' if /CURLOPT_SSL_VERIFYPEER/
		$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
		$_ = '' if /CURLOPT_HTTP_VERSION/
		$_ = '' if /CURLOPT_INTERLEAVEDATA/
		</stripfile>
		<file name="log/test1401.c" mode="text">
		/******* Sample code generated by the curl command line tool ********
		@@ -100,7 +101,6 @@ int main(int argc, char *argv[])
		them yourself.

		CURLOPT_WRITEDATA set to a objectpointer
		CURLOPT_INTERLEAVEDATA set to a objectpointer
		CURLOPT_WRITEFUNCTION set to a functionpointer
		CURLOPT_READDATA set to a objectpointer
		CURLOPT_READFUNCTION set to a functionpointer

tests/data/test1402

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ s/(USERAGENT, \")[^\"]+/${1}stripped/
		$_ = '' if /CURLOPT_SSL_VERIFYPEER/
		$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
		$_ = '' if /CURLOPT_HTTP_VERSION/
		$_ = '' if /CURLOPT_INTERLEAVEDATA/
		</stripfile>
		<file name="log/test1402.c" mode="text">
		/******* Sample code generated by the curl command line tool ********
		@@ -88,7 +89,6 @@ int main(int argc, char *argv[])
		them yourself.

		CURLOPT_WRITEDATA set to a objectpointer
		CURLOPT_INTERLEAVEDATA set to a objectpointer
		CURLOPT_WRITEFUNCTION set to a functionpointer
		CURLOPT_READDATA set to a objectpointer
		CURLOPT_READFUNCTION set to a functionpointer

tests/data/test1403

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ s/(USERAGENT, \")[^\"]+/${1}stripped/
		$_ = '' if /CURLOPT_SSL_VERIFYPEER/
		$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
		$_ = '' if /CURLOPT_HTTP_VERSION/
		$_ = '' if /CURLOPT_INTERLEAVEDATA/
		</stripfile>
		<file name="log/test1403.c" mode="text">
		/******* Sample code generated by the curl command line tool ********
		@@ -83,7 +84,6 @@ int main(int argc, char *argv[])
		them yourself.

		CURLOPT_WRITEDATA set to a objectpointer
		CURLOPT_INTERLEAVEDATA set to a objectpointer
		CURLOPT_WRITEFUNCTION set to a functionpointer
		CURLOPT_READDATA set to a objectpointer
		CURLOPT_READFUNCTION set to a functionpointer

Admin message