Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes

changelog.d/17031.feature

@@ -0,0 +1 @@
+OIDC: try to JWT decode userinfo response if JSON parsing failed.

synapse/http/client.py

@@ -390,6 +390,13 @@ class BaseHttpClient:
                         cooperator=self._cooperator,
                     )
 
+                # Always make sure we add a user agent to the request
+                if headers is None:
+                    headers = Headers()
+
+                if not headers.hasHeader("User-Agent"):
+                    headers.addRawHeader("User-Agent", self.user_agent)
+
                 request_deferred: defer.Deferred = treq.request(
                     method,
                     uri,