Project

General

Profile

« Previous | Next » 

Revision 0a0a3e17

Added by Viktor Gurov over 4 years ago

set_curlproxy() fixes. Issue #11476

(cherry picked from commit 75a3b0decc8e26e42cdc04f84d7a1a806c922f5a)

View differences:

src/etc/inc/notices.inc
488 488
	curl_setopt($conn, CURLOPT_SSL_VERIFYPEER, true);
489 489
	curl_setopt($conn, CURLOPT_FRESH_CONNECT,  true);
490 490
	curl_setopt($conn, CURLOPT_RETURNTRANSFER, 1);
491
	set_curlproxy($ch);
491
	set_curlproxy($conn);
492 492
	$curl_post_telegram_data = curl_exec($conn);
493 493
	curl_close($conn);
494 494
	return $curl_post_telegram_data;	//json encoded
......
548 548
	curl_setopt($conn, CURLOPT_SSL_VERIFYPEER, true);
549 549
	curl_setopt($conn, CURLOPT_FRESH_CONNECT,  true);
550 550
	curl_setopt($conn, CURLOPT_RETURNTRANSFER, 1);
551
	set_curlproxy($ch);
551
	set_curlproxy($conn);
552 552
	$curl_post_pushover_data = curl_exec($conn);
553 553
	curl_close($conn);
554 554
	return $curl_post_pushover_data;	//json encoded
src/usr/local/www/services_acb.php
86 86
	curl_setopt($curl_session, CURLOPT_RETURNTRANSFER, 1);
87 87
	curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_label'] . '/' . rtrim(file_get_contents("/etc/version")));
88 88
	// Proxy
89
	curl_setopt_array($curl_session, configure_proxy());
89
	set_curlproxy($curl_session);
90 90

  
91 91
	$data = curl_exec($curl_session);
92 92
	if (curl_errno($curl_session)) {
......
118 118
	curl_setopt($curl_session, CURLOPT_RETURNTRANSFER, 1);
119 119
	curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_label'] . '/' . rtrim(file_get_contents("/etc/version")));
120 120
	// Proxy
121
	curl_setopt_array($curl_session, configure_proxy());
121
	set_curlproxy($curl_session);
122 122
	$data = curl_exec($curl_session);
123 123
	$data_split = explode('++++', $data);
124 124
	$sha256 = trim($data_split[0]);
......
192 192

  
193 193
	curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_label'] . '/' . rtrim(file_get_contents("/etc/version")));
194 194
	// Proxy
195
	curl_setopt_array($curl_session, configure_proxy());
195
	set_curlproxy($curl_session);
196 196
	$data = curl_exec($curl_session);
197 197

  
198 198
	if (!tagfile_deformat($data, $data1, "config.xml")) {
......
233 233

  
234 234
	curl_setopt($curl_session, CURLOPT_USERAGENT, $g['product_label'] . '/' . rtrim(file_get_contents("/etc/version")));
235 235
	// Proxy
236
	curl_setopt_array($curl_session, configure_proxy());
236
	set_curlproxy($curl_session);
237 237

  
238 238
	$data = curl_exec($curl_session);
239 239

  

Also available in: Unified diff