From bfdc83cf6d8eafa93650065cc1be5b1b06bfe7b9 Mon Sep 17 00:00:00 2001
From: Alex Barreto <axbarreto@lavabit.com>
Date: Tue, 15 Jun 2021 09:34:11 -0400
Subject: [PATCH] Merge branch 'master' of github.com:OSGeo/gdal

* 'master' of github.com:OSGeo/gdal:
  /vsiswift/: advertize missing options
  /vsivs/: advertize missing GS_NO_SIGN_REQUEST option
  /vsiaz/: advertize missing AZURE_NO_SIGN_REQUEST option
  Warp kernel: prevent potential int overflows for > 2 GB work buffers, and constify
---
 gdal/port/cpl_vsil_gs.cpp | 6 ++++--
 port/cpl_vsil_swift.cpp   | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gdal/port/cpl_vsil_gs.cpp b/gdal/port/cpl_vsil_gs.cpp
index b8be49e198ab..a358e8f00e85 100644
--- a/gdal/port/cpl_vsil_gs.cpp
+++ b/gdal/port/cpl_vsil_gs.cpp
@@ -221,6 +221,8 @@ const char* VSIGSFSHandler::GetOptions()
         "description='Secret access key. To use with GS_ACCESS_KEY_ID'/>"
     "  <Option name='GS_ACCESS_KEY_ID' type='string' "
         "description='Access key id'/>"
+    "  <Option name='GS_NO_SIGN_REQUEST' type='boolean' "
+        "description='Whether to disable signing of requests' default='NO'/>"
     "  <Option name='GS_OAUTH2_REFRESH_TOKEN' type='string' "
         "description='OAuth2 refresh token. For OAuth2 client authentication. "
         "To use with GS_OAUTH2_CLIENT_ID and GS_OAUTH2_CLIENT_SECRET'/>"
@@ -251,8 +253,8 @@ const char* VSIGSFSHandler::GetOptions()
         "default='~/.aws/config'/>"
     "  <Option name='CPL_GS_CREDENTIALS_FILE' type='string' "
         "description='Filename that contains Google Storage credentials' "
-        "default='~/.boto'/>" +
-        VSICurlFilesystemHandler::GetOptionsStatic() +
+        "default='~/.boto'/>"
+    + VSICurlFilesystemHandler::GetOptionsStatic() +
         "</Options>");
     return osOptions.c_str();
 }
diff --git a/port/cpl_vsil_swift.cpp b/port/cpl_vsil_swift.cpp
index b1c08cef3305..317bb7a9e34c 100644
--- a/port/cpl_vsil_swift.cpp
+++ b/port/cpl_vsil_swift.cpp
@@ -388,7 +388,11 @@ const char* VSISwiftFSHandler::GetOptions()
         "description='Project domain name'/>"
     "  <Option name='OS_REGION_NAME' type='string' "
         "description='Region name'/>"
+<<<<<<< HEAD:port/cpl_vsil_swift.cpp
     +  VSICurlFilesystemHandlerBase::GetOptionsStatic() +
+=======
+    +  VSICurlFilesystemHandler::GetOptionsStatic() +
+>>>>>>> a8a68b1126 (Merge branch 'master' of github.com:OSGeo/gdal):gdal/port/cpl_vsil_swift.cpp
         "</Options>");
     return osOptions.c_str();
 }