You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2015/02/24 13:41:26 UTC
svn commit: r1661925 - in /httpd/mod_spdy/trunk: build_modssl_with_npn.sh
mod_spdy/mod_spdy.cc
Author: jim
Date: Tue Feb 24 12:41:25 2015
New Revision: 1661925
URL: http://svn.apache.org/r1661925
Log:
Update w/ current
Modified:
httpd/mod_spdy/trunk/build_modssl_with_npn.sh
httpd/mod_spdy/trunk/mod_spdy/mod_spdy.cc
Modified: httpd/mod_spdy/trunk/build_modssl_with_npn.sh
URL: http://svn.apache.org/viewvc/httpd/mod_spdy/trunk/build_modssl_with_npn.sh?rev=1661925&r1=1661924&r2=1661925&view=diff
==============================================================================
--- httpd/mod_spdy/trunk/build_modssl_with_npn.sh (original)
+++ httpd/mod_spdy/trunk/build_modssl_with_npn.sh Tue Feb 24 12:41:25 2015
@@ -104,7 +104,7 @@ function uncompress_file {
fi
}
-OPENSSL_SRC_TGZ_URL="https://www.openssl.org/source/openssl-1.0.1h.tar.gz"
+OPENSSL_SRC_TGZ_URL="https://www.openssl.org/source/openssl-1.0.1j.tar.gz"
APACHE_HTTPD_SRC_TGZ_URL="https://archive.apache.org/dist/httpd/httpd-2.4.10.tar.gz"
APACHE_HTTPD_MODSSL_NPN_PATCH_PATH="$(dirname $0)/scripts/mod_ssl_with_npn.patch"
@@ -123,7 +123,7 @@ cp $APACHE_HTTPD_MODSSL_NPN_PATCH_PATH $
pushd $BUILDROOT >/dev/null
-download_file $OPENSSL_SRC_TGZ_URL $OPENSSL_SRC_TGZ 8d6d684a9430d5cc98a62a5d8fbda8cf
+download_file $OPENSSL_SRC_TGZ_URL $OPENSSL_SRC_TGZ f7175c9cd3c39bb1907ac8bba9df8ed3
download_file $APACHE_HTTPD_SRC_TGZ_URL $APACHE_HTTPD_SRC_TGZ 9b5f9342f73a6b1ad4e8c4b0f3f5a159
echo ""
Modified: httpd/mod_spdy/trunk/mod_spdy/mod_spdy.cc
URL: http://svn.apache.org/viewvc/httpd/mod_spdy/trunk/mod_spdy/mod_spdy.cc?rev=1661925&r1=1661924&r2=1661925&view=diff
==============================================================================
--- httpd/mod_spdy/trunk/mod_spdy/mod_spdy.cc (original)
+++ httpd/mod_spdy/trunk/mod_spdy/mod_spdy.cc Tue Feb 24 12:41:25 2015
@@ -512,7 +512,6 @@ int AdvertiseSpdy(conn_rec* connection,
// Advertise SPDY to the client. We push protocol names in descending order
// of preference; the one we'd most prefer comes first.
// TODO(mdsteele): Advertise SPDY/3.1 once we fully support it.
- APR_ARRAY_PUSH(protos, const char*) = kSpdy31ProtocolName;
APR_ARRAY_PUSH(protos, const char*) = kSpdy3ProtocolName;
APR_ARRAY_PUSH(protos, const char*) = kSpdy2ProtocolName;