Commit: 155d03aea26c303a2a6bb281324de6f2e6b173d2 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Révision: 155d03aea26c303a2a6bb281324de6f2e6b173d2 (tree)
• l'heure: 2017-09-05 05:21:54
• Auteur: Keith Marshall <keith@user...>
• Commiter: Keith Marshall

Message de Log

Improve probability of establishing successful URL connections.

Change Summary

• modified: ChangeLog
• modified: src/pkginet.cpp

Modification

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Improve probability of establishing successful URL connections.
+
+	* src/pkginet.cpp (pkgInternetAgent::OpenURL): Add...
+	(INTERNET_FLAG_KEEP_CONNECTION, INTERNET_FLAG_IGNORE_CERT_CN_INVALID)
+	(INTERNET_FLAG_IGNORE_CERT_DATE_INVALID, INTERNET_FLAG_PRAGMA_NOCACHE)
+	(INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS)
+	(INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP): ...these flags, when calling
+	the InternetOpenUrl() function.
+
 2017-09-01  Keith Marshall  <[e-mail]>
 
 	Increment version for first OSDN hosted release.

--- a/src/pkginet.cpp
+++ b/src/pkginet.cpp
@@ -4,7 +4,7 @@
  * $Id$
  *
  * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2009-2013, MinGW.org Project
+ * Copyright (C) 2009-2013, 2017, MinGW.org Project
  *
  *
  * Implementation of the package download machinery for mingw-get.
@@ -458,7 +458,14 @@ HINTERNET pkgInternetAgent::OpenURL( const char *URL )
 	    * specify it anyway, on the off-chance that it may introduce
 	    * an undocumented benefit beyond wishful thinking.
 	    */
-	   SessionHandle, URL, NULL, 0, INTERNET_FLAG_EXISTING_CONNECT, 0
+	   SessionHandle, URL, NULL, 0,
+	   INTERNET_FLAG_EXISTING_CONNECT
+	   | INTERNET_FLAG_IGNORE_CERT_CN_INVALID
+	   | INTERNET_FLAG_IGNORE_CERT_DATE_INVALID
+	   | INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS
+	   | INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP
+	   | INTERNET_FLAG_KEEP_CONNECTION
+	   | INTERNET_FLAG_PRAGMA_NOCACHE, 0
 	 );
        if( ResourceHandle == NULL )
        {
@@ -469,11 +476,14 @@ HINTERNET pkgInternetAgent::OpenURL( const char *URL )
 	 {
 	   /* ...in which case, we diagnose failure to open the URL.
 	    */
+	   unsigned int status = GetLastError();
 	   DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_INTERNET_REQUESTS ),
 	     dmh_printf( "%s\nConnection failed(status=%u); abandoned.\n",
-		 URL, GetLastError() )
+		 URL, status )
+	     );
+	   dmh_notify(
+	       DMH_ERROR, "%s:cannot open URL; status = %u\n", URL, status
 	     );
-	   dmh_notify( DMH_ERROR, "%s:cannot open URL\n", URL );
 	 }
 	 else DEBUG_INVOKE_IF( DEBUG_REQUEST( DEBUG_TRACE_INTERNET_REQUESTS ),
 	   dmh_printf( "%s\nConnecting ... failed(status=%u); retrying in %ds...\n",