New configuration option Disable_Program_Ini.

Add corresponding documentation.

Part of T530-009.

Author: TurboGit

docs/build.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                              Ada Web Server                              --
 --                                                                          --
---                     Copyright (C) 2000-2018, AdaCore                     --
+--                     Copyright (C) 2000-2020, AdaCore                     --
 --                                                                          --
 --  This is free software;  you can redistribute it  and/or modify it       --
 --  under terms of the  GNU General Public License as published  by the     --
@@ -144,6 +144,7 @@ begin
    Add ("SESSION_ID_LENGTH", Default.Session_Id_Length);
    Add ("TLS_TICKET_SUPPORT", Default.TLS_Ticket_Support);
    Add ("CONFIG_DIRECTORY", Default.Config_Directory);
+   Add ("DISABLE_PROGRAM_INI", Default.Disable_Program_Ini);
    Add ("USER_AGENT", Default.User_Agent);
    Add ("SERVER_HEADER", Default.Server_Header);
    Text_IO.Put_Line ("""""""");

docs/source/using_aws.rst

@@ -862,6 +862,17 @@ Current supported options are:
   Specify the filename for the directory browser template page. The
   default value is |DIRECTORY_BROWSER_PAGE|.
 
+*Disable_Program_Ini (boolean)*
+
+  .. index:: Disable_Program_Ini
+
+  Specify whether the configuration file :file:`program_name.ini` should be
+  parsed or not. If this option is set to FALSE the program specific
+  configuration file won't be parsed. This may be useful if another
+  application is using such a file and cannot be shared. This setting
+  is expected to be set in :file:`aws.ini` before the :file:`program_name.ini`
+  file is parsed. The default value is |DISABLE_PROGRAM_INI|.
+
 *Down_Image (string)*
 
   .. index:: Down_Image

src/core/aws-config.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                              Ada Web Server                              --
 --                                                                          --
---                     Copyright (C) 2000-2019, AdaCore                     --
+--                     Copyright (C) 2000-2020, AdaCore                     --
 --                                                                          --
 --  This library is free software;  you can redistribute it and/or modify   --
 --  it under terms of the  GNU General Public License  as published by the  --
@@ -237,6 +237,15 @@ package body AWS.Config is
       return To_String (O.P (Directory_Browser_Page).Str_Value);
    end Directory_Browser_Page;
 
+   -------------------------
+   -- Disable_Program_Ini --
+   -------------------------
+
+   function Disable_Program_Ini return Boolean is
+   begin
+      return Process_Options (Disable_Program_Ini).Bool_Value;
+   end Disable_Program_Ini;
+
    ----------------
    -- Down_Image --
    ----------------

src/core/aws-config.ads

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                              Ada Web Server                              --
 --                                                                          --
---                     Copyright (C) 2000-2019, AdaCore                     --
+--                     Copyright (C) 2000-2020, AdaCore                     --
 --                                                                          --
 --  This library is free software;  you can redistribute it and/or modify   --
 --  it under terms of the  GNU General Public License  as published by the  --
@@ -382,6 +382,9 @@ package AWS.Config is
    function Config_Directory return String with Inline;
    --  Directory where AWS parameter files are located
 
+   function Disable_Program_Ini return Boolean with Inline;
+   --  Whether the <program_name>.ini file should be read
+
    function Transient_Cleanup_Interval return Duration with Inline;
    --  Number of seconds between each run of the cleaner task to remove
    --  transient pages.
@@ -520,6 +523,7 @@ private
       Session_Cleaner_Priority,
       Service_Priority,
       Config_Directory,
+      Disable_Program_Ini,
       User_Agent,
       Transient_Cleanup_Interval,
       Transient_Lifetime,
@@ -796,6 +800,9 @@ private
                         Config_Directory             =>
                           (Str, +Default.Config_Directory),
 
+                        Disable_Program_Ini          =>
+                          (Bool, Default.Disable_Program_Ini),
+
                         User_Agent                   =>
                           (Str, +Default.User_Agent),
 

src/core/aws-default.ads

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                              Ada Web Server                              --
 --                                                                          --
---                     Copyright (C) 2000-2019, AdaCore                     --
+--                     Copyright (C) 2000-2020, AdaCore                     --
 --                                                                          --
 --  This library is free software;  you can redistribute it and/or modify   --
 --  it under terms of the  GNU General Public License  as published by the  --
@@ -157,6 +157,7 @@ package AWS.Default with Pure is
    Security                        : constant Boolean := False;
    Security_Mode                   : constant String  := "TLS";
    Config_Directory                : constant String  := ".config/ada-web-srv";
+   Disable_Program_Ini             : constant Boolean := False;
    Cipher_Priorities               : constant String  := "";
    TLS_Ticket_Support              : constant Boolean := False;
    Certificate                     : constant String  := "cert.pem";