Merge pull request #196 from infosiftr/downloads.apache.org

Add/use downloads.apache.org (www-us.apache.org seems to be having a sad)

2.4/Dockerfile

@@ -63,6 +63,7 @@ RUN set -eux; \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
 			'https://www.apache.org/dyn/closer.cgi?action=download&filename=' \
 # if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/
+			https://downloads.apache.org/ \
 			https://www-us.apache.org/dist/ \
 			https://www.apache.org/dist/ \
 			https://archive.apache.org/dist/ \

2.4/alpine/Dockerfile

@@ -69,6 +69,7 @@ RUN set -eux; \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
 			'https://www.apache.org/dyn/closer.cgi?action=download&filename=' \
 # if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/
+			https://downloads.apache.org/ \
 			https://www-us.apache.org/dist/ \
 			https://www.apache.org/dist/ \
 			https://archive.apache.org/dist/ \

update.sh

@@ -11,16 +11,16 @@ versions=( "${versions[@]%/}" )
 
 for version in "${versions[@]}"; do
 	fullVersion="$(
-		wget -qO- "https://www-us.apache.org/dist/httpd/" \
+		wget -qO- 'https://downloads.apache.org/httpd/' \
 			| grep -E '<a href="httpd-'"$version"'[^"-]+.tar.bz2"' \
 			| sed -r 's!.*<a href="httpd-([^"-]+).tar.bz2".*!\1!' \
 			| sort -V \
 			| tail -1
 	)"
-	sha256="$(wget -qO- "https://www-us.apache.org/dist/httpd/httpd-$fullVersion.tar.bz2.sha256" | cut -d' ' -f1)"
+	sha256="$(wget -qO- "https://downloads.apache.org/httpd/httpd-$fullVersion.tar.bz2.sha256" | cut -d' ' -f1)"
 	echo "$version: $fullVersion"
 
-	patchesUrl="https://www-us.apache.org/dist/httpd/patches/apply_to_$fullVersion"
+	patchesUrl="https://downloads.apache.org/httpd/patches/apply_to_$fullVersion"
 	patches=()
 	if wget --quiet --spider -O /dev/null -o /dev/null "$patchesUrl/"; then
 		patchFiles="$(