Fixes #49179 : convert correcly proxy port when reading ogr layers

qgis · Aug 30, 2022 · 47013fa · 47013fa
1 parent 8398ca8
commit 47013fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/core/qgsgdalutils.cpp b/src/core/qgsgdalutils.cpp
@@ -492,7 +492,7 @@ void QgsGdalUtils::setupProxy()
       //excludes = settings.value( QStringLiteral( "proxy/proxyExcludedUrls" ), "" ).toStringList();
 
       const QString proxyHost( proxy.hostName() );
-      const qint16 proxyPort( proxy.port() );
+      const quint16 proxyPort( proxy.port() );
 
       const QString proxyUser( proxy.user() );
       const QString proxyPassword( proxy.password() );

diff --git a/tests/src/core/testqgsogrprovider.cpp b/tests/src/core/testqgsogrprovider.cpp
@@ -83,7 +83,7 @@ void TestQgsOgrProvider::setupProxy()
   QgsSettings settings;
   {
     settings.setValue( QStringLiteral( "proxy/proxyEnabled" ), true );
-    settings.setValue( QStringLiteral( "proxy/proxyPort" ), QStringLiteral( "1234" ) );
+    settings.setValue( QStringLiteral( "proxy/proxyPort" ), QStringLiteral( "38124" ) );
     settings.setValue( QStringLiteral( "proxy/proxyHost" ), QStringLiteral( "myproxyhostname.com" ) );
     settings.setValue( QStringLiteral( "proxy/proxyUser" ), QStringLiteral( "username" ) );
     settings.setValue( QStringLiteral( "proxy/proxyPassword" ), QStringLiteral( "password" ) );
@@ -92,7 +92,7 @@ void TestQgsOgrProvider::setupProxy()
     const QgsVectorLayer vl( mTestDataDir + '/' + QStringLiteral( "lines.shp" ), QStringLiteral( "proxy_test" ), QLatin1String( "ogr" ) );
     QVERIFY( vl.isValid() );
     const char *proxyConfig = CPLGetConfigOption( "GDAL_HTTP_PROXY", nullptr );
-    QCOMPARE( proxyConfig, "myproxyhostname.com:1234" );
+    QCOMPARE( proxyConfig, "myproxyhostname.com:38124" );
     const char *proxyCredentials = CPLGetConfigOption( "GDAL_HTTP_PROXYUSERPWD", nullptr );
     QCOMPARE( proxyCredentials, "username:password" );
   }