mollyim/unbound
1
0
Fork 0
mirror of https://github.com/mollyim/unbound.git synced 2025-05-13 05:40:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert changes in files managed by maintainers, move docker do contrib dir

Browse source
This commit is contained in:
Tomasz Ziolkowski 2021-08-04 12:57:55 +02:00
parent a922c6d525
commit 1900ea3bb3
6 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -56,4 +56,3 @@
/testdata/.perfstats.txt /testdata/.perfstats.txt
/doc/html /doc/html
/doc/xml /doc/xml
.idea

5
configure vendored
View file

@ -683,7 +683,6 @@ HAVE_SSL
PC_CRYPTO_DEPENDENCY PC_CRYPTO_DEPENDENCY
CONFIG_DATE CONFIG_DATE
NETBSD_LINTFLAGS NETBSD_LINTFLAGS
GCC_DOCKER_LINTFLAGS
PYUNBOUND_UNINSTALL PYUNBOUND_UNINSTALL
PYUNBOUND_INSTALL PYUNBOUND_INSTALL
PYUNBOUND_TARGET PYUNBOUND_TARGET
@ -17889,10 +17888,6 @@ if test "`uname`" = "NetBSD"; then
fi fi
if test "`uname -o`" = "GNU/Linux"; then
# splint cannot parse modern c99 header files
GCC_DOCKER_LINTFLAGS='-syntax'
fi
CONFIG_DATE=`date +%Y%m%d` CONFIG_DATE=`date +%Y%m%d`

6
configure.ac
View file

@ -776,6 +776,12 @@ if test "`uname`" = "NetBSD"; then
NETBSD_LINTFLAGS='"-D__RENAME(x)=" -D_NETINET_IN_H_' NETBSD_LINTFLAGS='"-D__RENAME(x)=" -D_NETINET_IN_H_'
AC_SUBST(NETBSD_LINTFLAGS) AC_SUBST(NETBSD_LINTFLAGS)
fi fi
if test "`uname -o`" = "GNU/Linux"; then
# splint cannot parse modern c99 header files
GCC_DOCKER_LINTFLAGS='-syntax'
AC_SUBST(GCC_DOCKER_LINTFLAGS)
fi
CONFIG_DATE=`date +%Y%m%d` CONFIG_DATE=`date +%Y%m%d`
AC_SUBST(CONFIG_DATE) AC_SUBST(CONFIG_DATE)

0
Dockerfile → contrib/Dockerfile.tests
View file

2
doc/README.tests
View file

@ -16,7 +16,7 @@ You need to have the following programs installed and in your PATH.
The optional programs are detected and can be omitted. The optional programs are detected and can be omitted.
You can also use prepared Dockerfile to run tests inside docker based on latest gcc image: You can also use prepared Dockerfile to run tests inside docker based on latest gcc image:
* build container: docker build -t unbound-tester . * build container: docker build -t unbound-tester -f contrib/Dockerfile.tests .
* run container: docker run -it --mount type=bind,source="$(pwd)",target=/usr/src/unbound --rm unbound-tester * run container: docker run -it --mount type=bind,source="$(pwd)",target=/usr/src/unbound --rm unbound-tester
* configure environment: ./configure * configure environment: ./configure
* run test: make test * run test: make test

7
util/netevent.c
View file

@ -1232,13 +1232,6 @@ ssl_handshake(struct comm_point* c)
if(want == SSL_ERROR_WANT_READ) { if(want == SSL_ERROR_WANT_READ) {
if(c->ssl_shake_state == comm_ssl_shake_read) if(c->ssl_shake_state == comm_ssl_shake_read)
return 1; return 1;
/* According to https://www.openssl.org/docs/man1.1.1/man3/SSL_do_handshake.html
* we should repeat handshake - for non blocking BIO
*/
if(c->ssl_shake_state == comm_ssl_shake_write) {
comm_point_listen_for_rw(c, 0, 1);
return 1;
}
c->ssl_shake_state = comm_ssl_shake_read; c->ssl_shake_state = comm_ssl_shake_read;
comm_point_listen_for_rw(c, 1, 0); comm_point_listen_for_rw(c, 1, 0);
return 1; return 1;