diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2022-02-14 14:16:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-14 14:16:27 +0100 |
| commit | 4db1dd5471ccc6b714699801cacd1774e8ff9c33 (patch) | |
| tree | a5a3b9ec15b277c059afa6a3955688670636751e /src/proj_internal.h | |
| parent | 944efc557af4068be7dcf7c44ca9262516e4cc8a (diff) | |
| parent | 0f4509430517b5fd5f411e4c47e51971cbdafce3 (diff) | |
| download | PROJ-4db1dd5471ccc6b714699801cacd1774e8ff9c33.tar.gz PROJ-4db1dd5471ccc6b714699801cacd1774e8ff9c33.zip | |
Merge pull request #3049 from rouault/proj_ini_ca_bundle_path
proj.ini: add a 'ca_bundle_path' variable
Diffstat (limited to 'src/proj_internal.h')
| -rw-r--r-- | src/proj_internal.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/proj_internal.h b/src/proj_internal.h index 0ae90cf6..dd478932 100644 --- a/src/proj_internal.h +++ b/src/proj_internal.h @@ -644,7 +644,6 @@ struct projCppContext; struct projNetworkCallbacksAndData { bool enabled = false; - bool enabled_env_variable_checked = false; // whereas we have checked PROJ_NETWORK env variable proj_network_open_cbk_type open = nullptr; proj_network_close_cbk_type close = nullptr; proj_network_get_header_value_cbk_type get_header_value = nullptr; @@ -688,7 +687,6 @@ struct pj_ctx{ int use_proj4_init_rules = -1; /* -1 = unknown, 0 = no, 1 = yes */ bool forceOver = false; int epsg_file_exists = -1; /* -1 = unknown, 0 = no, 1 = yes */ - std::string ca_bundle_path{}; std::string env_var_proj_lib{}; // content of PROJ_LIB environment variable. Use Filemanager::getProjLibEnvVar() to access std::vector<std::string> search_paths{}; @@ -708,6 +706,7 @@ struct pj_ctx{ bool iniFileLoaded = false; std::string endpoint{}; projNetworkCallbacksAndData networking{}; + std::string ca_bundle_path{}; projGridChunkCache gridChunkCache{}; TMercAlgo defaultTmercAlgo = TMercAlgo::PODER_ENGSAGER; // can be overridden by content of proj.ini // END ini file settings |