forked from cybrespace/mastodon
		
	Fix error
This commit is contained in:
		
							parent
							
								
									cea9fb31fe
								
							
						
					
					
						commit
						956da43e19
					
				
					 1 changed files with 5 additions and 1 deletions
				
			
		| 
						 | 
					@ -1,7 +1,11 @@
 | 
				
			||||||
module Rack
 | 
					module Rack
 | 
				
			||||||
  class Request
 | 
					  class Request
 | 
				
			||||||
    def trusted_proxy?(ip)
 | 
					    def trusted_proxy?(ip)
 | 
				
			||||||
      Rails.application.config.action_dispatch.trusted_proxies.any? { |proxy| proxy === ip }
 | 
					      if Rails.application.config.action_dispatch.trusted_proxies.nil?
 | 
				
			||||||
 | 
					        super
 | 
				
			||||||
 | 
					      else
 | 
				
			||||||
 | 
					        Rails.application.config.action_dispatch.trusted_proxies.any? { |proxy| proxy === ip }
 | 
				
			||||||
 | 
					      end
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue