diff options
| author | Cody P Schafer <[email protected]> | 2015-06-24 17:17:43 -0400 |
|---|---|---|
| committer | Cody P Schafer <[email protected]> | 2015-06-29 10:58:45 -0400 |
| commit | 01e01e3747dd0dbd46486c4f9406c29488a28c19 (patch) | |
| tree | 8d5fce95ba0ce40e60e8618ee35d91e254568734 /openssl/test | |
| parent | ssl/NPN: factor out encoding of the protocol list (diff) | |
| download | rust-openssl-01e01e3747dd0dbd46486c4f9406c29488a28c19.tar.xz rust-openssl-01e01e3747dd0dbd46486c4f9406c29488a28c19.zip | |
ssl: support ALPN
Heavily based on the existing NPN wrapping code. Naming of public
functions is identical to the NPN ones with `s/npn/alpn/` applied to
prevent devs from needing to remember 2 names (and to let my copy the
npn tests and perform the subistution to generate the apln tests).
It might make sense to (at some point) use macros or a trait to cut down
the duplication.
Diffstat (limited to 'openssl/test')
| -rwxr-xr-x | openssl/test/test.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/test/test.sh b/openssl/test/test.sh index 975b124e..9beb37c3 100755 --- a/openssl/test/test.sh +++ b/openssl/test/test.sh @@ -4,7 +4,7 @@ cd $(dirname $0) openssl s_server -accept 15418 -www -cert cert.pem -key key.pem >/dev/null 2>&1 & openssl s_server -accept 15419 -www -cert cert.pem -key key.pem \ - -nextprotoneg "http/1.1,spdy/3.1" >/dev/null 2>&1 & + -nextprotoneg "http/1.1,spdy/3.1" -alpn "http/1.1,spdy/3.1" >/dev/null 2>&1 & openssl s_server -no_ssl2 -accept 15420 -www -cert cert.pem -key key.pem >/dev/null 2>&1 & if test "$TRAVIS_OS_NAME" == "osx"; then |