Browse Source

fix bug && 取消不必要的修改

pull/4/head
欧醚 3 years ago
parent
commit
747ac90294
2 changed files with 5 additions and 8 deletions
  1. +0
    -1
      app/controllers/api/v1/timelines/tag_controller.rb
  2. +5
    -7
      app/lib/request.rb

+ 0
- 1
app/controllers/api/v1/timelines/tag_controller.rb View File

@ -1,7 +1,6 @@
# frozen_string_literal: true
class Api::V1::Timelines::TagController < Api::BaseController
before_action :require_user!
before_action :load_tag
after_action :insert_pagination_headers, unless: -> { @statuses.empty? }

+ 5
- 7
app/lib/request.rb View File

@ -17,10 +17,10 @@ end
class Request
REQUEST_TARGET = '(request-target)'
# We enforce a 15s timeout on DNS resolving, 15s timeout on socket opening
# and 15s timeout on the TLS handshake, meaning the worst case should take
# about 45s in total
TIMEOUT = { connect: 15, read: 30, write: 30 }.freeze
# We enforce a 5s timeout on DNS resolving, 5s timeout on socket opening
# and 5s timeout on the TLS handshake, meaning the worst case should take
# about 15s in total
TIMEOUT = { connect: 5, read: 10, write: 10 }.freeze
include RoutingHelper
@ -32,9 +32,7 @@ class Request
@http_client = options.delete(:http_client)
@options = options.merge(socket_class: use_proxy? ? ProxySocket : Socket)
@options = @options.merge(Rails.configuration.x.http_client_proxy) if use_proxy?
@headers = {
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.167 Safari/537.36',
}
@headers = {}
raise Mastodon::HostValidationError, 'Instance does not support hidden service connections' if block_hidden_service?

Loading…
Cancel
Save