DOC: update CHANGELOG

CHANGELOG.md

@@ -9,11 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added ###
 
+* HTTP connections are allowed additionally to HTTPS connections.
 * Dependency on the `requests` package.
 * Dependency on the `python-dateutil` package.
-* `Connection.https_proxy` option of the pycaosdb.ini and the `https_proxy`
-  paramter of the `configure_connection` function. See the documentation of the
+* `Connection.https_proxy` and `Connection.http_proxy` option of the
+  pycaosdb.ini and the `https_proxy` and `http_proxy` parameter of the
+  `configure_connection` function. See the documentation of the
   latter for more information.
+  Note that the `HTTP_PROXY` and `HTTPS_PROXY` environment variables are
+  respected as well, unless overridden programmatically.
 * `apiutils.empty_diff` function that returns `True` if the diffs of two
   entities found with the `compare_entitis` function are empty, `False`
   otherwise.
@@ -34,8 +38,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Deprecated ###
 
 * `Connection.socket_proxy` option of the pycaosdb.ini. Please use
-  `Connection.https_proxy` instead. The deprecated option will be removed with
-  the next minor release.
+  `Connection.https_proxy` or `Connection.http_proxy` instead. The deprecated
+  option will be removed with the next minor release.
 
 ### Removed ###
 

src/caosdb/configuration.py

@@ -57,6 +57,8 @@ def configure(inifile):
 
     if "HTTPS_PROXY" in environ:
         _pycaosdbconf["Connection"]["https_proxy"] = environ["HTTPS_PROXY"]
+    if "HTTP_PROXY" in environ:
+        _pycaosdbconf["Connection"]["http_proxy"] = environ["HTTP_PROXY"]
     return read_config