Compare commits

..

No commits in common. "fbca6d8e9328ad2b6fbd04344bcc7ded99f532c6" and "c5ba790d13c40c2c61c912f62bd838c1da7841a3" have entirely different histories.

2 changed files with 2 additions and 2 deletions

View File

@ -34,7 +34,7 @@ jobs:
run: copy Makefile.win Makefile run: copy Makefile.win Makefile
- name: dirs Windows - name: dirs Windows
if: ${{ startsWith(matrix.target, 'windows') }} if: ${{ startsWith(matrix.target, 'windows') }}
run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib/VC/x64/MT" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win && dir "c:/program files/openssl/lib"' run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win'
- name: SSLPlugin Linux - name: SSLPlugin Linux
if: ${{ startsWith(matrix.target, 'ubuntu') }} if: ${{ startsWith(matrix.target, 'ubuntu') }}
run: "sed -i '/^PLUGIN/s/$/ SSLPlugin/' Makefile && sed -i '/^LIBS/s/$/ -lcrypto -lssl/' Makefile" run: "sed -i '/^PLUGIN/s/$/ SSLPlugin/' Makefile && sed -i '/^LIBS/s/$/ -lcrypto -lssl/' Makefile"

View File

@ -536,7 +536,7 @@ static void* ssl_filter_open(void * idata, struct srvparam * srv){
SSL_CTX_set_verify(sc->srv_ctx, SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL); SSL_CTX_set_verify(sc->srv_ctx, SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
} }
} }
#ifdef WITHSPLICE #ifdef WIWHSPLICE
srv->usesplice = 0; srv->usesplice = 0;
#endif #endif
return sc; return sc;