merged http2 branch

.gitignore

@@ -18,3 +18,4 @@ src/filter/trackers
 test/src/fdnstress/fdnstress
 test/src/ptest/ptest
 gcov-dir
+src/cashpack-0.3

Makefile.in

@@ -1,5 +1,6 @@
 all: apps man
 APPS = src/fdns test/src/fdnstress
+LIBS = src/cashpack-0.3
 MANPAGES = fdns.1
 
 prefix=@prefix@
@@ -15,9 +16,14 @@ NAME=@PACKAGE_NAME@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 DOCDIR=@docdir@
 
+.PHONY: libs $(LIBS)
+libs: $(LIBS)
+$(LIBS):
+	$(MAKE) -C $@
+
 .PHONY: apps $(APPS)
 apps: $(APPS)
-$(APPS):
+$(APPS): $(LIBS)
 	$(MAKE) -C $@
 
 $(MANPAGES): $(wildcard src/man/*.txt)
@@ -30,6 +36,9 @@ clean:
 	for dir in $(APPS); do \
 		$(MAKE) -C $$dir clean; \
 	done
+	for dir in $(LIBS); do \
+		$(MAKE) -C $$dir clean; \
+	done
 	rm -f $(MANPAGES) $(MANPAGES:%=%.gz)
 	cd test/compile; ./compile.sh --clean; cd ../..
 
@@ -38,6 +47,7 @@ distclean: clean
 		$(MAKE) -C $$dir distclean; \
 	done
 	rm -fr Makefile autom4te.cache config.log config.status config.h dummy.o src/common.mk
+	rm -fr src/cashpack-0.3
 
 realinstall:
 	# fdns executable

README

@@ -54,6 +54,9 @@ Daniel Schildt (https://github.com/d2s)
 rcplab (https://github.com/rcplab)
 	- containerpi and twnic
 
+Incoporating cashpack library, https://github.com/Dridi/cashpack
+Copyright ©2016-2017 Dridi Boukelmoune, license MIT
+
 Incorporating code from Firejail Security Sandbox, https://github.com/netblue30/firejail
 Copyright © 2014-2020 Firejail Authors, license GPLv2
 

README.md

@@ -43,7 +43,12 @@ FDNS is a community project. We are not affiliated with any company, and we don
 
 ## Project Status
 
-Release `0.9.62.6` is out.
+Development version 0.9.63:
+<ul>
+<li>HTTP1.1 removed and replaced with HTTP2.</li>
+<li>Adding support for https://commons.host network of DoH servers (20+ servers).</li>
+<li>Replaced --allow-local-doh with --disable-local-doh.</li>
+</ul>
 
 <div style="height:20px;">&nbsp;</div>
 

configure

@@ -3952,6 +3952,8 @@ if test "$prefix" = /usr; then
 	test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc"
 fi
 
+cd src && tar -xzvf cashpack-0.3.tar.gz && cd cashpack-0.3 && ./configure && cd ../..
+
 ac_config_files="$ac_config_files Makefile src/common.mk src/fdns/Makefile test/src/fdnstress/Makefile"
 
 cat >confcache <<\_ACEOF

configure.ac

@@ -77,6 +77,8 @@ if test "$prefix" = /usr; then
 	test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc"
 fi
 
+cd src && tar -xzvf cashpack-0.3.tar.gz && cd cashpack-0.3 && ./configure && cd ../..
+
 AC_OUTPUT(Makefile src/common.mk src/fdns/Makefile test/src/fdnstress/Makefile)
 
 echo