admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Strategy: Create constant for HTTP separator

Browse Source
This commit is contained in:
Sam Ford 2021-06-04 13:12:01 -04:00
parent ccfd01ba38
commit 793ea17749
No known key found for this signature in database
GPG Key ID: 95209E46C7FFDEFE
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/livecheck/strategy.rb
View File

@ -19,7 +19,15 @@ module Homebrew
# the middle of this range. Strategies with a priority of 0 (or lower) # the middle of this range. Strategies with a priority of 0 (or lower)
# are ignored. # are ignored.
DEFAULT_PRIORITY = 5 DEFAULT_PRIORITY = 5
private_constant :DEFAULT_PRIORITY
# HTTP response head(s) and body are typically separated by a double
# `CRLF` (whereas HTTP header lines are separated by a single `CRLF`).
# In rare cases, this can also be a double newline (`\n\n`).
HTTP_HEAD_BODY_SEPARATOR = "\r\n\r\n"
# The `#strategies` method expects `Strategy` constants to be strategies,
# so constants we create need to be private for this to work properly.
private_constant :DEFAULT_PRIORITY, :HTTP_HEAD_BODY_SEPARATOR
# Creates and/or returns a `@strategies` `Hash`, which maps a snake # Creates and/or returns a `@strategies` `Hash`, which maps a snake
# case strategy name symbol (e.g. `:page_match`) to the associated # case strategy name symbol (e.g. `:page_match`) to the associated
@ -166,11 +174,11 @@ module Homebrew
max_iterations = 5 max_iterations = 5
iterations = 0 iterations = 0
output = output.lstrip output = output.lstrip
while output.match?(%r{\AHTTP/[\d.]+ \d+}) && output.include?("\r\n\r\n") while output.match?(%r{\AHTTP/[\d.]+ \d+}) && output.include?(HTTP_HEAD_BODY_SEPARATOR)
iterations += 1 iterations += 1
raise "Too many redirects (max = #{max_iterations})" if iterations > max_iterations raise "Too many redirects (max = #{max_iterations})" if iterations > max_iterations
head_text, _, output = output.partition("\r\n\r\n") head_text, _, output = output.partition(HTTP_HEAD_BODY_SEPARATOR)
output = output.lstrip output = output.lstrip
location = head_text[/^Location:\s*(.*)$/i, 1] location = head_text[/^Location:\s*(.*)$/i, 1]