瀏覽代碼

Check OpenSSL version (Travis CI)

bel2125 5 年之前
父節點
當前提交
8542633239
共有 2 個文件被更改,包括 7 次插入2 次删除
  1. 3 1
      .travis.yml
  2. 4 1
      src/civetweb.c

+ 3 - 1
.travis.yml

@@ -62,9 +62,11 @@ before_script:
   - if [[ "${BUILD_TYPE}" == "OSX_OPENSSL_1_1" ]]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install openssl@1.1 ;fi
   # Generate the build scripts with CMake
   - mkdir output
+  - openssl version
+  - gcc --version 
+  - cmake --version
   - gcc unittest/cgi_test.c -o output/cgi_test.cgi
   - cd output
-  - cmake --version
   - cmake
     -G "Unix Makefiles"
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE}

+ 4 - 1
src/civetweb.c

@@ -16648,7 +16648,10 @@ init_ssl_ctx_impl(struct mg_context *phys_ctx,
 	}
 
 	/* Initialize ALPN only of TLS library (OpenSSL version) supports ALPN */
-	if (!tls_feature_missing[TLS_ALPN]) {
+#if !defined(NO_SSL_DL)
+	if (!tls_feature_missing[TLS_ALPN])
+#endif
+	{
 		init_alpn(phys_ctx, dom_ctx);
 	}