[cmm/downloader] add new proxy for https sources

added verification of the second initialization attempt

Reviewed-on: #274

programs/cmm/browser/WebView.c

@@ -521,7 +521,7 @@ bool GetUrl(dword _http_url)
 		http.get(_http_url);
 		return true;
 	} else if (!strncmp(_http_url,"https://",8)) {
-		strcpy(#new_url_full, "http://gate.aspero.pro/?site=");
+		strcpy(#new_url_full, "http://176.223.130.192:82/?site=");
 		strncat(#new_url_full, _http_url, URL_SIZE);
 		http.get(#new_url_full);
 		return true;

programs/cmm/downloader/dl.c

@@ -168,9 +168,9 @@ void StartDownloading()
 	ResetDownloadSpeed();
 	pb.back_color = 0xFFFfff;
 	if (!strncmp(#uEdit,"https:",6)) {
-		//miniprintf(#get_url, "http://gate.aspero.pro/?site=%s", #uEdit);
-		notify("'HTTPS for download temporary is not supported,\ntrying to download the file via HTTP' -W");
-		miniprintf(#uEdit, "http://%s", #uEdit+8);
+		miniprintf(#get_url, "http://176.223.130.192:82/?site=%s", #uEdit);
+		// notify("'HTTPS for download temporary is not supported,\ntrying to download the file via HTTP' -W");
+		// miniprintf(#uEdit, "http://%s", #uEdit+8);
 	}
 	strcpy(#get_url, #uEdit);
 

programs/cmm/lib/obj/http.h

@@ -112,7 +112,7 @@ struct _http
 dword _http::get(dword _url)
 {
 	cur_url = _url;
-	if (streqrp(cur_url, "http://gate.aspero.pro/?site=")) cur_url += 29;
+	if (streqrp(cur_url, "http://176.223.130.192:82/?site=")) cur_url += 29;
 	http_get stdcall (_url, 0, 0, #accept_language);
 	transfer = EAX;
 	return EAX;

programs/develop/libraries/http/http.asm

@@ -100,6 +100,10 @@ lib_init: ;//////////////////////////////////////////////////////////////////;;
         mov     [mem.alloc], eax
         mov     [mem.free], ebx
         mov     [mem.realloc], ecx
+
+        cmp     [dll.load], edx
+        je      .ok
+
         mov     [dll.load], edx
 
         invoke  dll.load, @IMPORT
@@ -115,6 +119,7 @@ lib_init: ;//////////////////////////////////////////////////////////////////;;
         invoke  ini.get_str, inifile, sec_proxy, key_password, proxyPassword, 256, proxyPassword
         popa
 
+  .ok:
         DEBUGF  1, "HTTP library: init OK\n"
         xor     eax, eax
         ret

programs/develop/libraries/libs-dev/libimg/libimg.asm

@@ -78,6 +78,10 @@ proc lib_init ;///////////////////////////////////////////////////////////////;;
         mov     [mem.alloc], eax
         mov     [mem.free], ebx
         mov     [mem.realloc], ecx
+
+        cmp     [dll.load], edx
+        je      .ok
+
         mov     [dll.load], edx
 
         or      edx, edx

programs/develop/libraries/libs-dev/libini/libini_p.asm

@@ -37,6 +37,10 @@ proc libini._.init ;////////////////////////////////////////////////////////////
         mov     [mem.alloc], eax
         mov     [mem.free], ebx
         mov     [mem.realloc], ecx
+
+        cmp     [dll.load], edx
+        je      .ok
+
         mov     [dll.load], edx
 
         invoke  dll.load, @IMPORT

programs/develop/libraries/proc_lib/trunk/proc_lib.asm

@@ -33,7 +33,8 @@ use_ColorDialog
 ;--------------------------------------------------
 align 16
 lib_init:
-ret
+        xor     eax, eax
+        ret
 
 ;--------------------------------------------------
 align 16