Merge branch 'correct-and-improve-http-options' into 'develop'

lib/pleroma/http/connection.ex

lib/pleroma/reverse_proxy.ex

lib/pleroma/web/activity_pub/activity_pub.ex

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

lib/pleroma/web/ostatus/ostatus.ex

lib/pleroma/web/salmon/salmon.ex

lib/pleroma/web/web_finger/web_finger.ex

lib/pleroma/web/websub/websub.ex