You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2015/07/14 14:50:42 UTC
svn commit: r1690916 - in /httpd/test/mod_h2/trunk: ./ clients/ conf/
conf/sites/ nghttp2/ test/
Author: icing
Date: Tue Jul 14 12:50:42 2015
New Revision: 1690916
URL: http://svn.apache.org/r1690916
Log:
some rework to let nghttp2/openssl install in prefix
Added:
httpd/test/mod_h2/trunk/clients/Makefile.am
httpd/test/mod_h2/trunk/nghttp2/Makefile.am
Removed:
httpd/test/mod_h2/trunk/clients/Makefile
httpd/test/mod_h2/trunk/nghttp2/Makefile
Modified:
httpd/test/mod_h2/trunk/Makefile
httpd/test/mod_h2/trunk/Makefile.am
httpd/test/mod_h2/trunk/clients/ (props changed)
httpd/test/mod_h2/trunk/conf/httpd.conf
httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf
httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf
httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf
httpd/test/mod_h2/trunk/configure.ac
httpd/test/mod_h2/trunk/nghttp2/ (props changed)
httpd/test/mod_h2/trunk/test/test_common.sh
Modified: httpd/test/mod_h2/trunk/Makefile
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/Makefile?rev=1690916&r1=1690915&r2=1690916&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/Makefile (original)
+++ httpd/test/mod_h2/trunk/Makefile Tue Jul 14 12:50:42 2015
@@ -203,11 +203,11 @@ distuninstallcheck_listfiles = find . -t
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
-ABS_PWD = /Users/sei/projects/httpd/test/mod_h2/trunk
+ABS_PWD =
ACLOCAL = ${SHELL} /Users/sei/projects/httpd/test/mod_h2/trunk/missing aclocal-1.15
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 0
-APACHECTL = /opt/apache-trunk/bin/apachectl -d $(BLD_PREFIX)
+APACHECTL = /opt/apache-trunk/bin/apachectl -d $(SERVER_DIR)
APXS = /opt/apache-trunk/bin/apxs
AR = ar
AUTOCONF = ${SHELL} /Users/sei/projects/httpd/test/mod_h2/trunk/missing autoconf
@@ -220,6 +220,7 @@ CCDEPMODE = depmode=none
CFLAGS = -g -O2
CPP = gcc -E
CPPFLAGS = -I/opt/apache-trunk/include -I/opt/apache-trunk/include
+CURL_CONF = --with-nghttp2=$(prefix) --with-ssl=$(prefix)
CYGPATH_W = echo
DEFS = -DPACKAGE_NAME=\"mod_h2_test\" -DPACKAGE_TARNAME=\"mod_h2_test\" -DPACKAGE_VERSION=\"0.0.1\" -DPACKAGE_STRING=\"mod_h2_test\ 0.0.1\" -DPACKAGE_BUGREPORT=\"stefan.eissing@greenbytes.de\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\"
DEPDIR = .deps
@@ -255,10 +256,16 @@ MAKEINFO = ${SHELL} /Users/sei/projects/
MANIFEST_TOOL = :
MKDIR_P = ./install-sh -c -d
MODULES = /opt/apache-trunk/modules
+NGHTTP2_DEPS = gen/.zlib-installed gen/.libev-installed gen/.openssl-installed
+NGHTTP2_VERSION = 1.0.5
NM = /usr/bin/nm
NMEDIT = nmedit
OBJDUMP = false
OBJEXT = o
+OPENSSL = /usr/bin/openssl
+OPENSSL_CONF = darwin64-x86_64-cc
+OPENSSL_CONF_CMD = ./Configure
+OPENSSL_VERSION = 1.0.2d
OTOOL = otool
OTOOL64 = :
PACKAGE = mod_h2_test
@@ -273,7 +280,8 @@ PATH_SEPARATOR = :
PHPCGI = /usr/local/bin/php-cgi
RANLIB = ranlib
SED = /usr/bin/sed
-SERVER_NAME = delight.local
+SERVER_DIR = /Users/sei/projects/httpd/test/mod_h2/trunk/gen/apache
+SERVER_NAME = delight.greenbytes.de
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
@@ -291,7 +299,7 @@ am__leading_dot = .
am__quote =
am__tar = $${TAR-tar} chof - "$$tardir"
am__untar = $${TAR-tar} xf -
-bindir = /opt/apache-trunk/bin
+bindir = ${exec_prefix}/bin
build = x86_64-apple-darwin14.4.0
build_alias =
build_cpu = x86_64
@@ -370,12 +378,10 @@ HTTP_AUTH = $(HOST_NAME):$(HTTP_PORT)
HTTPS_AUTH = $(HOST_NAME):$(HTTPS_PORT)
HTTPS_AUTH2 = $(HOST2_NAME):$(HTTPS_PORT)
GEN = gen
-INST_DIR = gen/apache
-BLD_PREFIX = /Users/sei/projects/httpd/test/mod_h2/trunk/$(INST_DIR)
SUB_DIRS = clients
-CURL = $(INST_DIR)/bin/curl
-NGHTTP = $(INST_DIR)/bin/nghttp
-H2LOAD = $(INST_DIR)/bin/h2load
+CURL = $(prefix)/bin/curl
+NGHTTP = $(prefix)/bin/nghttp
+H2LOAD = $(prefix)/bin/h2load
MAX_STREAMS = 100
################################################################################
@@ -798,68 +804,69 @@ distdir:
@rm -f $(distdir)/conf/ssl/mod-h2.greebytes.de*
@rm -f $(distdir)/conf/sites/mod-h2.greebytes.de.conf
-start: $(INST_DIR)/.test-setup
- @$(APACHECTL) -k start
+start: $(SERVER_DIR)/.test-setup
+ $(APACHECTL) -k start
-start-debug: $(INST_DIR)/.test-setup
- @$(APACHECTL) -k start -X
+start-debug: $(SERVER_DIR)/.test-setup
+ $(APACHECTL) -k start -X
-start-gdb: $(INST_DIR)/.test-setup
- @gdb $(HTTPD)
+start-gdb: $(SERVER_DIR)/.test-setup
+ gdb $(HTTPD)
-restart: $(INST_DIR)/.test-setup
+restart: $(SERVER_DIR)/.test-setup
@echo -n shutting down httpd...
@$(APACHECTL) -k stop
@while true; do sleep 1; pkill -1 -U $(USER) httpd; test "$$?" != "0" && break; done
@echo done.
- @$(APACHECTL) -k restart
+ $(APACHECTL) -k restart
stop:
- @$(APACHECTL) -k stop
+ $(APACHECTL) -k stop
install:
+ @make -C nghttp2 install
@make -C clients install
################################################################################
# Test the local httpd
#
test: \
- $(INST_DIR)/.test-setup \
- $(INST_DIR)/.curl-installed
+ $(SERVER_DIR)/.test-setup \
+ $(SERVER_DIR)/.curl-installed
@rm -rf $(GEN)/tmp
@mkdir -p $(GEN)/tmp
- @bash test/test_curl_altsvc.sh http://$(HTTP_AUTH) https://$(HTTPS_AUTH)
- @bash test/test_alt_host.sh https://$(HTTPS_AUTH)
- @bash test/test_nghttp_get.sh https://$(HTTPS_AUTH)
- @bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)
- @bash test/test_curl_get.sh https://$(HTTPS_AUTH)
- @bash test/test_curl_post.sh https://$(HTTPS_AUTH)
- @bash test/test_nghttp_get.sh https://$(HTTPS_AUTH)/proxy
- @bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)/proxy
- @bash test/test_curl_get.sh https://$(HTTPS_AUTH)/proxy
- @bash test/test_curl_post.sh https://$(HTTPS_AUTH)/proxy
- @bash test/test_nghttp_get.sh https://$(HTTPS_AUTH)/rewrite
- @bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)/rewrite
- @bash test/test_curl_get.sh https://$(HTTPS_AUTH)/rewrite
- @bash test/test_curl_post.sh https://$(HTTPS_AUTH)/rewrite
- @bash test/test_nghttp_get.sh http://$(HTTP_AUTH)
- @bash test/test_nghttp_post.sh http://$(HTTP_AUTH)
- @bash test/test_curl_get.sh http://$(HTTP_AUTH)
- @bash test/test_curl_post.sh http://$(HTTP_AUTH)
- @bash test/test_nghttp_get.sh http://$(HTTP_AUTH) direct
- @bash test/test_nghttp_post.sh http://$(HTTP_AUTH) direct
- @bash test/test_nghttp_get.sh http://$(HTTP_AUTH)/proxy
- @bash test/test_nghttp_post.sh http://$(HTTP_AUTH)/proxy
- @bash test/test_curl_get.sh http://$(HTTP_AUTH)/proxy
- @bash test/test_curl_post.sh http://$(HTTP_AUTH)/proxy
- @bash test/test_nghttp_get.sh http://$(HTTP_AUTH)/rewrite
- @bash test/test_nghttp_post.sh http://$(HTTP_AUTH)/rewrite
- @bash test/test_curl_get.sh http://$(HTTP_AUTH)/rewrite
- @bash test/test_curl_post.sh http://$(HTTP_AUTH)/rewrite
- @bash test/test_nghttp_get.sh https://$(HTTPS_AUTH2)
- @bash test/test_nghttp_post.sh https://$(HTTPS_AUTH2)
- @bash test/test_curl_get.sh https://$(HTTPS_AUTH2)
- @bash test/test_curl_post.sh https://$(HTTPS_AUTH2)
+ @PREFIX=$(prefix) bash test/test_curl_altsvc.sh http://$(HTTP_AUTH) https://$(HTTPS_AUTH)
+ @PREFIX=$(prefix) bash test/test_alt_host.sh https://$(HTTPS_AUTH)
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh https://$(HTTPS_AUTH)
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)
+ @PREFIX=$(prefix) bash test/test_curl_get.sh https://$(HTTPS_AUTH)
+ @PREFIX=$(prefix) bash test/test_curl_post.sh https://$(HTTPS_AUTH)
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh https://$(HTTPS_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_curl_get.sh https://$(HTTPS_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_curl_post.sh https://$(HTTPS_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh https://$(HTTPS_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_curl_get.sh https://$(HTTPS_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_curl_post.sh https://$(HTTPS_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh http://$(HTTP_AUTH)
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh http://$(HTTP_AUTH)
+ @PREFIX=$(prefix) bash test/test_curl_get.sh http://$(HTTP_AUTH)
+ @PREFIX=$(prefix) bash test/test_curl_post.sh http://$(HTTP_AUTH)
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh http://$(HTTP_AUTH) direct
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh http://$(HTTP_AUTH) direct
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh http://$(HTTP_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh http://$(HTTP_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_curl_get.sh http://$(HTTP_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_curl_post.sh http://$(HTTP_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh http://$(HTTP_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh http://$(HTTP_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_curl_get.sh http://$(HTTP_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_curl_post.sh http://$(HTTP_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh https://$(HTTPS_AUTH2)
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh https://$(HTTPS_AUTH2)
+ @PREFIX=$(prefix) bash test/test_curl_get.sh https://$(HTTPS_AUTH2)
+ @PREFIX=$(prefix) bash test/test_curl_post.sh https://$(HTTPS_AUTH2)
################################################################################
# Load Test
@@ -876,8 +883,8 @@ $(GEN)/load-urls-2.txt: \
@sed -e "s,SUBST_AUTH_SUBST,http://$(HTTP_AUTH)," < test/load-urls-1.txt >$(GEN)/load-urls-2.txt
loadtest: \
- $(INST_DIR)/.test-setup \
- $(INST_DIR)/.curl-installed \
+ $(SERVER_DIR)/.test-setup \
+ $(SERVER_DIR)/.curl-installed \
$(GEN)/load-urls-1.txt
$(H2LOAD) -c 100 -t 10 -n 100000 -m $(MAX_STREAMS) https://$(HTTPS_AUTH)/index.html
$(H2LOAD) -i $(GEN)/load-urls-1.txt -n 200000 -t 1 -m $(MAX_STREAMS) -c 8
@@ -892,144 +899,145 @@ loadtest: \
################################################################################
# Switch mpm modules
#
-mpm_worker: $(INST_DIR)/.testdocs-setup
- @test -L $(INST_DIR)/conf/mods-enabled/mpm_worker.load || \
- (rm -f $(INST_DIR)/conf/mods-enabled/mpm_*; \
- ln -s ../mods-available/mpm_worker.load $(INST_DIR)/conf/mods-enabled/ && \
+mpm_worker: $(SERVER_DIR)/.testdocs-setup
+ @test -L $(SERVER_DIR)/conf/mods-enabled/mpm_worker.load || \
+ (rm -f $(SERVER_DIR)/conf/mods-enabled/mpm_*; \
+ ln -s ../mods-available/mpm_worker.load $(SERVER_DIR)/conf/mods-enabled/ && \
echo "mpm_worker configured, please restart.")
-mpm_event: $(INST_DIR)/.testdocs-setup
- @test -L $(INST_DIR)/conf/mods-enabled/mpm_event.load || \
- (rm -f $(INST_DIR)/conf/mods-enabled/mpm_*; \
- ln -s ../mods-available/mpm_event.load $(INST_DIR)/conf/mods-enabled/ && \
+mpm_event: $(SERVER_DIR)/.testdocs-setup
+ @test -L $(SERVER_DIR)/conf/mods-enabled/mpm_event.load || \
+ (rm -f $(SERVER_DIR)/conf/mods-enabled/mpm_*; \
+ ln -s ../mods-available/mpm_event.load $(SERVER_DIR)/conf/mods-enabled/ && \
echo "mpm_event configured, please restart.")
-mpm_prefork: $(INST_DIR)/.testdocs-setup
- @test -L $(INST_DIR)/conf/mods-enabled/mpm_prefork.load || \
- (rm -f $(INST_DIR)/conf/mods-enabled/mpm_*; \
- ln -s ../mods-available/mpm_prefork.load $(INST_DIR)/conf/mods-enabled/ && \
+mpm_prefork: $(SERVER_DIR)/.testdocs-setup
+ @test -L $(SERVER_DIR)/conf/mods-enabled/mpm_prefork.load || \
+ (rm -f $(SERVER_DIR)/conf/mods-enabled/mpm_*; \
+ ln -s ../mods-available/mpm_prefork.load $(SERVER_DIR)/conf/mods-enabled/ && \
echo "mpm_prefork configured, please restart.")
-$(INST_DIR)/.testdocs-setup: \
+$(SERVER_DIR)/.testdocs-setup: \
conf/* htdocs/*/*
@echo -n setup htdocs locally...
- @mkdir -p $(INST_DIR)/htdocs
- @cp -r htdocs/test.example.org $(INST_DIR)/htdocs/test.example.org
- @chmod +x $$(find $(INST_DIR)/htdocs/test.example.org/ -name "*.py" )
+ @mkdir -p $(SERVER_DIR)/htdocs
+ @cp -r htdocs/test.example.org $(SERVER_DIR)/htdocs/test.example.org
+ @chmod +x $$(find $(SERVER_DIR)/htdocs/test.example.org/ -name "*.py" )
@echo done.
- @touch $(INST_DIR)/.testdocs-setup
+ @touch $(SERVER_DIR)/.testdocs-setup
-$(INST_DIR)/.test-setup: \
+$(SERVER_DIR)/.test-setup: \
Makefile \
conf/*.conf \
bin/* \
conf/mods-available/*.* \
conf/sites/*.conf \
- $(INST_DIR)/conf/ssl/test.example.org.key \
- $(INST_DIR)/conf/ssl/test.example.org.pem \
- $(INST_DIR)/conf/ssl/test-ser.example.org.key \
- $(INST_DIR)/conf/ssl/test-ser.example.org.pem \
- $(INST_DIR)/conf/ssl/noh2.example.org.key \
- $(INST_DIR)/conf/ssl/noh2.example.org.pem \
- $(INST_DIR)/.testdocs-setup
+ $(SERVER_DIR)/conf/ssl/test.example.org.key \
+ $(SERVER_DIR)/conf/ssl/test.example.org.pem \
+ $(SERVER_DIR)/conf/ssl/test-ser.example.org.key \
+ $(SERVER_DIR)/conf/ssl/test-ser.example.org.pem \
+ $(SERVER_DIR)/conf/ssl/noh2.example.org.key \
+ $(SERVER_DIR)/conf/ssl/noh2.example.org.pem \
+ $(SERVER_DIR)/.testdocs-setup
@echo -n setup httpd locally...
- @mkdir -p $(INST_DIR)/conf/sites
- @mkdir -p $(INST_DIR)/conf/mods-available
- @mkdir -p $(INST_DIR)/conf/mods-enabled
- @mkdir -p $(INST_DIR)/conf/ssl
- @mkdir -p $(INST_DIR)/logs
- @ln -fs /opt/apache-trunk/modules $(INST_DIR)/modules
+ @mkdir -p $(SERVER_DIR)/bin
+ @mkdir -p $(SERVER_DIR)/conf/sites
+ @mkdir -p $(SERVER_DIR)/conf/mods-available
+ @mkdir -p $(SERVER_DIR)/conf/mods-enabled
+ @mkdir -p $(SERVER_DIR)/conf/ssl
+ @mkdir -p $(SERVER_DIR)/logs
+ @ln -fs /opt/apache-trunk/modules $(SERVER_DIR)/modules
@for file in $(SETUP_FILES); do \
- sed -e "s,SUBST_SERVER_ROOT_SUBST,$(BLD_PREFIX),g" \
- -e "s,SUBST_SERVER_NAME_SUBST,delight.local,g" \
+ sed -e "s,SUBST_SERVER_ROOT_SUBST,$(SERVER_DIR),g" \
+ -e "s,SUBST_SERVER_NAME_SUBST,delight.greenbytes.de,g" \
-e "s,SUBST_PORT_HTTP_SUBST,$(HTTP_PORT),g" \
-e "s,SUBST_PORT_HTTPS_SUBST,$(HTTPS_PORT),g" \
-e "s,SUBST_PHP_CGI_SUBST,/usr/local/bin/php-cgi,g" \
- < $$file > $(INST_DIR)/$$file; \
+ < $$file > $(SERVER_DIR)/$$file; \
done
- @for i in bin/*; do chmod +x $(INST_DIR)/$$i; done
- @cp conf/ssl/*.* $(INST_DIR)/conf/ssl
- @test -L $(INST_DIR)/conf/mods-enabled/mpm*load || ln -fs ../mods-available/mpm_worker.load $(INST_DIR)/conf/mods-enabled/
+ @for i in bin/*; do chmod +x $(SERVER_DIR)/$$i; done
+ @cp conf/ssl/*.* $(SERVER_DIR)/conf/ssl
+ @test -L $(SERVER_DIR)/conf/mods-enabled/mpm*load || ln -fs ../mods-available/mpm_worker.load $(SERVER_DIR)/conf/mods-enabled/
@echo done.
- @touch $(INST_DIR)/.test-setup
+ @touch $(SERVER_DIR)/.test-setup
-$(INST_DIR)/conf/ssl/test.example.org.key:
- @mkdir -p $(INST_DIR)/conf/ssl
- openssl genrsa -out $(INST_DIR)/conf/ssl/test.example.org.key 4096
+$(SERVER_DIR)/conf/ssl/test.example.org.key:
+ @mkdir -p $(SERVER_DIR)/conf/ssl
+ openssl genrsa -out $(SERVER_DIR)/conf/ssl/test.example.org.key 4096
-$(INST_DIR)/conf/ssl/test.example.org.req: \
- $(INST_DIR)/conf/ssl/test.example.org.key \
+$(SERVER_DIR)/conf/ssl/test.example.org.req: \
+ $(SERVER_DIR)/conf/ssl/test.example.org.key \
conf/ssl/test.example.org.x509.input
- openssl req -new -key $(INST_DIR)/conf/ssl/test.example.org.key \
- -out $(INST_DIR)/conf/ssl/test.example.org.req < conf/ssl/test.example.org.x509.input
+ openssl req -new -key $(SERVER_DIR)/conf/ssl/test.example.org.key \
+ -out $(SERVER_DIR)/conf/ssl/test.example.org.req < conf/ssl/test.example.org.x509.input
-$(INST_DIR)/conf/ssl/test.example.org.x509.input: \
+$(SERVER_DIR)/conf/ssl/test.example.org.x509.input: \
conf/ssl/test.example.org.x509.input
- cp conf/ssl/test.example.org.x509.input $(INST_DIR)/conf/ssl
+ cp conf/ssl/test.example.org.x509.input $(SERVER_DIR)/conf/ssl
-$(INST_DIR)/conf/ssl/test.example.org.pem: \
- $(INST_DIR)/conf/ssl/test.example.org.key \
- $(INST_DIR)/conf/ssl/test.example.org.req \
+$(SERVER_DIR)/conf/ssl/test.example.org.pem: \
+ $(SERVER_DIR)/conf/ssl/test.example.org.key \
+ $(SERVER_DIR)/conf/ssl/test.example.org.req \
conf/ssl/extensions.conf \
conf/ssl/test.example.org.x509.input
openssl x509 -req -sha256 -days 1095 \
- -signkey $(INST_DIR)/conf/ssl/test.example.org.key \
- -in $(INST_DIR)/conf/ssl/test.example.org.req \
- -out $(INST_DIR)/conf/ssl/test.example.org.pem \
+ -signkey $(SERVER_DIR)/conf/ssl/test.example.org.key \
+ -in $(SERVER_DIR)/conf/ssl/test.example.org.req \
+ -out $(SERVER_DIR)/conf/ssl/test.example.org.pem \
-extfile conf/ssl/extensions.conf -extensions ssl_client < conf/ssl/noh2.example.org.x509.input
-$(INST_DIR)/conf/ssl/test-ser.example.org.key:
- @mkdir -p $(INST_DIR)/conf/ssl
- openssl genrsa -out $(INST_DIR)/conf/ssl/test-ser.example.org.key 4096
+$(SERVER_DIR)/conf/ssl/test-ser.example.org.key:
+ @mkdir -p $(SERVER_DIR)/conf/ssl
+ openssl genrsa -out $(SERVER_DIR)/conf/ssl/test-ser.example.org.key 4096
-$(INST_DIR)/conf/ssl/test-ser.example.org.x509.input: \
+$(SERVER_DIR)/conf/ssl/test-ser.example.org.x509.input: \
conf/ssl/test-ser.example.org.x509.input
- cp conf/ssl/test-ser.example.org.x509.input $(INST_DIR)/conf/ssl
+ cp conf/ssl/test-ser.example.org.x509.input $(SERVER_DIR)/conf/ssl
-$(INST_DIR)/conf/ssl/test-ser.example.org.req: \
- $(INST_DIR)/conf/ssl/test-ser.example.org.key
- openssl req -new -key $(INST_DIR)/conf/ssl/test-ser.example.org.key \
- -out $(INST_DIR)/conf/ssl/test-ser.example.org.req < conf/ssl/test-ser.example.org.x509.input
-
-$(INST_DIR)/conf/ssl/test-ser.example.org.pem: \
- $(INST_DIR)/conf/ssl/test-ser.example.org.key \
- $(INST_DIR)/conf/ssl/test-ser.example.org.req \
+$(SERVER_DIR)/conf/ssl/test-ser.example.org.req: \
+ $(SERVER_DIR)/conf/ssl/test-ser.example.org.key
+ openssl req -new -key $(SERVER_DIR)/conf/ssl/test-ser.example.org.key \
+ -out $(SERVER_DIR)/conf/ssl/test-ser.example.org.req < conf/ssl/test-ser.example.org.x509.input
+
+$(SERVER_DIR)/conf/ssl/test-ser.example.org.pem: \
+ $(SERVER_DIR)/conf/ssl/test-ser.example.org.key \
+ $(SERVER_DIR)/conf/ssl/test-ser.example.org.req \
conf/ssl/extensions.conf \
conf/ssl/test-ser.example.org.x509.input
openssl x509 -req -sha256 -days 1095 \
- -signkey $(INST_DIR)/conf/ssl/test-ser.example.org.key \
- -in $(INST_DIR)/conf/ssl/test-ser.example.org.req \
- -out $(INST_DIR)/conf/ssl/test-ser.example.org.pem \
+ -signkey $(SERVER_DIR)/conf/ssl/test-ser.example.org.key \
+ -in $(SERVER_DIR)/conf/ssl/test-ser.example.org.req \
+ -out $(SERVER_DIR)/conf/ssl/test-ser.example.org.pem \
-extfile conf/ssl/extensions.conf -extensions ssl_client < conf/ssl/noh2.example.org.x509.input
-$(INST_DIR)/conf/ssl/noh2.example.org.key:
- @mkdir -p $(INST_DIR)/conf/ssl
- openssl genrsa -out $(INST_DIR)/conf/ssl/noh2.example.org.key 4096
+$(SERVER_DIR)/conf/ssl/noh2.example.org.key:
+ @mkdir -p $(SERVER_DIR)/conf/ssl
+ openssl genrsa -out $(SERVER_DIR)/conf/ssl/noh2.example.org.key 4096
-$(INST_DIR)/conf/ssl/noh2.example.org.x509.input: \
+$(SERVER_DIR)/conf/ssl/noh2.example.org.x509.input: \
conf/ssl/noh2.example.org.x509.input
- cp conf/ssl/noh2.example.org.x509.input $(INST_DIR)/conf/ssl
+ cp conf/ssl/noh2.example.org.x509.input $(SERVER_DIR)/conf/ssl
-$(INST_DIR)/conf/ssl/noh2.example.org.req: \
- $(INST_DIR)/conf/ssl/noh2.example.org.key
- openssl req -new -key $(INST_DIR)/conf/ssl/noh2.example.org.key \
- -out $(INST_DIR)/conf/ssl/noh2.example.org.req < conf/ssl/noh2.example.org.x509.input
-
-$(INST_DIR)/conf/ssl/noh2.example.org.pem: \
- $(INST_DIR)/conf/ssl/noh2.example.org.key \
- $(INST_DIR)/conf/ssl/noh2.example.org.req \
+$(SERVER_DIR)/conf/ssl/noh2.example.org.req: \
+ $(SERVER_DIR)/conf/ssl/noh2.example.org.key
+ openssl req -new -key $(SERVER_DIR)/conf/ssl/noh2.example.org.key \
+ -out $(SERVER_DIR)/conf/ssl/noh2.example.org.req < conf/ssl/noh2.example.org.x509.input
+
+$(SERVER_DIR)/conf/ssl/noh2.example.org.pem: \
+ $(SERVER_DIR)/conf/ssl/noh2.example.org.key \
+ $(SERVER_DIR)/conf/ssl/noh2.example.org.req \
conf/ssl/extensions.conf \
conf/ssl/noh2.example.org.x509.input
openssl x509 -req -sha256 -days 1095 \
- -signkey $(INST_DIR)/conf/ssl/noh2.example.org.key \
- -in $(INST_DIR)/conf/ssl/noh2.example.org.req \
- -out $(INST_DIR)/conf/ssl/noh2.example.org.pem \
+ -signkey $(SERVER_DIR)/conf/ssl/noh2.example.org.key \
+ -in $(SERVER_DIR)/conf/ssl/noh2.example.org.req \
+ -out $(SERVER_DIR)/conf/ssl/noh2.example.org.pem \
-extfile conf/ssl/extensions.conf -extensions ssl_client < conf/ssl/noh2.example.org.x509.input
################################################################################
# Install the local curl
#
-$(INST_DIR)/.curl-installed:
+$(SERVER_DIR)/.curl-installed:
make -C clients
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Modified: httpd/test/mod_h2/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/Makefile.am?rev=1690916&r1=1690915&r2=1690916&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/Makefile.am Tue Jul 14 12:50:42 2015
@@ -38,16 +38,15 @@ HTTPS_AUTH = $(HOST_NAME):$(HTTPS_PORT
HTTPS_AUTH2 = $(HOST2_NAME):$(HTTPS_PORT)
GEN = gen
-INST_DIR = gen/apache
-BLD_PREFIX = @ABS_PWD@/$(INST_DIR)
+SERVER_DIR = @SERVER_DIR@
SUB_DIRS = clients
-APACHECTL = @APACHECTL@ -d $(BLD_PREFIX)
+APACHECTL = @APACHECTL@ -d $(SERVER_DIR)
HTTPD = @HTTPD@
-CURL = $(INST_DIR)/bin/curl
-NGHTTP = $(INST_DIR)/bin/nghttp
-H2LOAD = $(INST_DIR)/bin/h2load
+CURL = $(prefix)/bin/curl
+NGHTTP = $(prefix)/bin/nghttp
+H2LOAD = $(prefix)/bin/h2load
.PHONY: clean test loadtest start stop restart
@@ -63,69 +62,70 @@ distdir:
@rm -f $(distdir)/conf/ssl/mod-h2.greebytes.de*
@rm -f $(distdir)/conf/sites/mod-h2.greebytes.de.conf
-start: $(INST_DIR)/.test-setup
- @$(APACHECTL) -k start
+start: $(SERVER_DIR)/.test-setup
+ $(APACHECTL) -k start
-start-debug: $(INST_DIR)/.test-setup
- @$(APACHECTL) -k start -X
+start-debug: $(SERVER_DIR)/.test-setup
+ $(APACHECTL) -k start -X
-start-gdb: $(INST_DIR)/.test-setup
- @gdb $(HTTPD)
+start-gdb: $(SERVER_DIR)/.test-setup
+ gdb $(HTTPD)
-restart: $(INST_DIR)/.test-setup
+restart: $(SERVER_DIR)/.test-setup
@echo -n shutting down httpd...
@$(APACHECTL) -k stop
@while true; do sleep 1; pkill -1 -U $(USER) httpd; test "$$?" != "0" && break; done
@echo done.
- @$(APACHECTL) -k restart
+ $(APACHECTL) -k restart
stop:
- @$(APACHECTL) -k stop
+ $(APACHECTL) -k stop
install:
+ @make -C nghttp2 install
@make -C clients install
################################################################################
# Test the local httpd
#
test: \
- $(INST_DIR)/.test-setup \
- $(INST_DIR)/.curl-installed
+ $(SERVER_DIR)/.test-setup \
+ $(SERVER_DIR)/.curl-installed
@rm -rf $(GEN)/tmp
@mkdir -p $(GEN)/tmp
- @bash test/test_curl_altsvc.sh http://$(HTTP_AUTH) https://$(HTTPS_AUTH)
- @bash test/test_alt_host.sh https://$(HTTPS_AUTH)
- @bash test/test_nghttp_get.sh https://$(HTTPS_AUTH)
- @bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)
- @bash test/test_curl_get.sh https://$(HTTPS_AUTH)
- @bash test/test_curl_post.sh https://$(HTTPS_AUTH)
- @bash test/test_nghttp_get.sh https://$(HTTPS_AUTH)/proxy
- @bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)/proxy
- @bash test/test_curl_get.sh https://$(HTTPS_AUTH)/proxy
- @bash test/test_curl_post.sh https://$(HTTPS_AUTH)/proxy
- @bash test/test_nghttp_get.sh https://$(HTTPS_AUTH)/rewrite
- @bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)/rewrite
- @bash test/test_curl_get.sh https://$(HTTPS_AUTH)/rewrite
- @bash test/test_curl_post.sh https://$(HTTPS_AUTH)/rewrite
- @bash test/test_nghttp_get.sh http://$(HTTP_AUTH)
- @bash test/test_nghttp_post.sh http://$(HTTP_AUTH)
- @bash test/test_curl_get.sh http://$(HTTP_AUTH)
- @bash test/test_curl_post.sh http://$(HTTP_AUTH)
- @bash test/test_nghttp_get.sh http://$(HTTP_AUTH) direct
- @bash test/test_nghttp_post.sh http://$(HTTP_AUTH) direct
- @bash test/test_nghttp_get.sh http://$(HTTP_AUTH)/proxy
- @bash test/test_nghttp_post.sh http://$(HTTP_AUTH)/proxy
- @bash test/test_curl_get.sh http://$(HTTP_AUTH)/proxy
- @bash test/test_curl_post.sh http://$(HTTP_AUTH)/proxy
- @bash test/test_nghttp_get.sh http://$(HTTP_AUTH)/rewrite
- @bash test/test_nghttp_post.sh http://$(HTTP_AUTH)/rewrite
- @bash test/test_curl_get.sh http://$(HTTP_AUTH)/rewrite
- @bash test/test_curl_post.sh http://$(HTTP_AUTH)/rewrite
- @bash test/test_nghttp_get.sh https://$(HTTPS_AUTH2)
- @bash test/test_nghttp_post.sh https://$(HTTPS_AUTH2)
- @bash test/test_curl_get.sh https://$(HTTPS_AUTH2)
- @bash test/test_curl_post.sh https://$(HTTPS_AUTH2)
+ @PREFIX=$(prefix) bash test/test_curl_altsvc.sh http://$(HTTP_AUTH) https://$(HTTPS_AUTH)
+ @PREFIX=$(prefix) bash test/test_alt_host.sh https://$(HTTPS_AUTH)
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh https://$(HTTPS_AUTH)
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)
+ @PREFIX=$(prefix) bash test/test_curl_get.sh https://$(HTTPS_AUTH)
+ @PREFIX=$(prefix) bash test/test_curl_post.sh https://$(HTTPS_AUTH)
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh https://$(HTTPS_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_curl_get.sh https://$(HTTPS_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_curl_post.sh https://$(HTTPS_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh https://$(HTTPS_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh https://$(HTTPS_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_curl_get.sh https://$(HTTPS_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_curl_post.sh https://$(HTTPS_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh http://$(HTTP_AUTH)
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh http://$(HTTP_AUTH)
+ @PREFIX=$(prefix) bash test/test_curl_get.sh http://$(HTTP_AUTH)
+ @PREFIX=$(prefix) bash test/test_curl_post.sh http://$(HTTP_AUTH)
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh http://$(HTTP_AUTH) direct
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh http://$(HTTP_AUTH) direct
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh http://$(HTTP_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh http://$(HTTP_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_curl_get.sh http://$(HTTP_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_curl_post.sh http://$(HTTP_AUTH)/proxy
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh http://$(HTTP_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh http://$(HTTP_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_curl_get.sh http://$(HTTP_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_curl_post.sh http://$(HTTP_AUTH)/rewrite
+ @PREFIX=$(prefix) bash test/test_nghttp_get.sh https://$(HTTPS_AUTH2)
+ @PREFIX=$(prefix) bash test/test_nghttp_post.sh https://$(HTTPS_AUTH2)
+ @PREFIX=$(prefix) bash test/test_curl_get.sh https://$(HTTPS_AUTH2)
+ @PREFIX=$(prefix) bash test/test_curl_post.sh https://$(HTTPS_AUTH2)
################################################################################
# Load Test
@@ -144,8 +144,8 @@ $(GEN)/load-urls-2.txt: \
MAX_STREAMS = 100
loadtest: \
- $(INST_DIR)/.test-setup \
- $(INST_DIR)/.curl-installed \
+ $(SERVER_DIR)/.test-setup \
+ $(SERVER_DIR)/.curl-installed \
$(GEN)/load-urls-1.txt
$(H2LOAD) -c 100 -t 10 -n 100000 -m $(MAX_STREAMS) https://$(HTTPS_AUTH)/index.html
$(H2LOAD) -i $(GEN)/load-urls-1.txt -n 200000 -t 1 -m $(MAX_STREAMS) -c 8
@@ -160,22 +160,22 @@ loadtest: \
################################################################################
# Switch mpm modules
#
-mpm_worker: $(INST_DIR)/.testdocs-setup
- @test -L $(INST_DIR)/conf/mods-enabled/mpm_worker.load || \
- (rm -f $(INST_DIR)/conf/mods-enabled/mpm_*; \
- ln -s ../mods-available/mpm_worker.load $(INST_DIR)/conf/mods-enabled/ && \
+mpm_worker: $(SERVER_DIR)/.testdocs-setup
+ @test -L $(SERVER_DIR)/conf/mods-enabled/mpm_worker.load || \
+ (rm -f $(SERVER_DIR)/conf/mods-enabled/mpm_*; \
+ ln -s ../mods-available/mpm_worker.load $(SERVER_DIR)/conf/mods-enabled/ && \
echo "mpm_worker configured, please restart.")
-mpm_event: $(INST_DIR)/.testdocs-setup
- @test -L $(INST_DIR)/conf/mods-enabled/mpm_event.load || \
- (rm -f $(INST_DIR)/conf/mods-enabled/mpm_*; \
- ln -s ../mods-available/mpm_event.load $(INST_DIR)/conf/mods-enabled/ && \
+mpm_event: $(SERVER_DIR)/.testdocs-setup
+ @test -L $(SERVER_DIR)/conf/mods-enabled/mpm_event.load || \
+ (rm -f $(SERVER_DIR)/conf/mods-enabled/mpm_*; \
+ ln -s ../mods-available/mpm_event.load $(SERVER_DIR)/conf/mods-enabled/ && \
echo "mpm_event configured, please restart.")
-mpm_prefork: $(INST_DIR)/.testdocs-setup
- @test -L $(INST_DIR)/conf/mods-enabled/mpm_prefork.load || \
- (rm -f $(INST_DIR)/conf/mods-enabled/mpm_*; \
- ln -s ../mods-available/mpm_prefork.load $(INST_DIR)/conf/mods-enabled/ && \
+mpm_prefork: $(SERVER_DIR)/.testdocs-setup
+ @test -L $(SERVER_DIR)/conf/mods-enabled/mpm_prefork.load || \
+ (rm -f $(SERVER_DIR)/conf/mods-enabled/mpm_*; \
+ ln -s ../mods-available/mpm_prefork.load $(SERVER_DIR)/conf/mods-enabled/ && \
echo "mpm_prefork configured, please restart.")
@@ -188,124 +188,125 @@ SETUP_FILES = conf/*.conf \
conf/mime.types \
bin/*
-$(INST_DIR)/.testdocs-setup: \
+$(SERVER_DIR)/.testdocs-setup: \
conf/* htdocs/*/*
@echo -n setup htdocs locally...
- @mkdir -p $(INST_DIR)/htdocs
- @cp -r htdocs/test.example.org $(INST_DIR)/htdocs/test.example.org
- @chmod +x $$(find $(INST_DIR)/htdocs/test.example.org/ -name "*.py" )
+ @mkdir -p $(SERVER_DIR)/htdocs
+ @cp -r htdocs/test.example.org $(SERVER_DIR)/htdocs/test.example.org
+ @chmod +x $$(find $(SERVER_DIR)/htdocs/test.example.org/ -name "*.py" )
@echo done.
- @touch $(INST_DIR)/.testdocs-setup
+ @touch $(SERVER_DIR)/.testdocs-setup
-$(INST_DIR)/.test-setup: \
+$(SERVER_DIR)/.test-setup: \
Makefile \
conf/*.conf \
bin/* \
conf/mods-available/*.* \
conf/sites/*.conf \
- $(INST_DIR)/conf/ssl/test.example.org.key \
- $(INST_DIR)/conf/ssl/test.example.org.pem \
- $(INST_DIR)/conf/ssl/test-ser.example.org.key \
- $(INST_DIR)/conf/ssl/test-ser.example.org.pem \
- $(INST_DIR)/conf/ssl/noh2.example.org.key \
- $(INST_DIR)/conf/ssl/noh2.example.org.pem \
- $(INST_DIR)/.testdocs-setup
+ $(SERVER_DIR)/conf/ssl/test.example.org.key \
+ $(SERVER_DIR)/conf/ssl/test.example.org.pem \
+ $(SERVER_DIR)/conf/ssl/test-ser.example.org.key \
+ $(SERVER_DIR)/conf/ssl/test-ser.example.org.pem \
+ $(SERVER_DIR)/conf/ssl/noh2.example.org.key \
+ $(SERVER_DIR)/conf/ssl/noh2.example.org.pem \
+ $(SERVER_DIR)/.testdocs-setup
@echo -n setup httpd locally...
- @mkdir -p $(INST_DIR)/conf/sites
- @mkdir -p $(INST_DIR)/conf/mods-available
- @mkdir -p $(INST_DIR)/conf/mods-enabled
- @mkdir -p $(INST_DIR)/conf/ssl
- @mkdir -p $(INST_DIR)/logs
- @ln -fs @MODULES@ $(INST_DIR)/modules
+ @mkdir -p $(SERVER_DIR)/bin
+ @mkdir -p $(SERVER_DIR)/conf/sites
+ @mkdir -p $(SERVER_DIR)/conf/mods-available
+ @mkdir -p $(SERVER_DIR)/conf/mods-enabled
+ @mkdir -p $(SERVER_DIR)/conf/ssl
+ @mkdir -p $(SERVER_DIR)/logs
+ @ln -fs @MODULES@ $(SERVER_DIR)/modules
@for file in $(SETUP_FILES); do \
- sed -e "s,SUBST_SERVER_ROOT_SUBST,$(BLD_PREFIX),g" \
+ sed -e "s,SUBST_SERVER_ROOT_SUBST,$(SERVER_DIR),g" \
-e "s,SUBST_SERVER_NAME_SUBST,@SERVER_NAME@,g" \
-e "s,SUBST_PORT_HTTP_SUBST,$(HTTP_PORT),g" \
-e "s,SUBST_PORT_HTTPS_SUBST,$(HTTPS_PORT),g" \
-e "s,SUBST_PHP_CGI_SUBST,@PHPCGI@,g" \
- < $$file > $(INST_DIR)/$$file; \
+ < $$file > $(SERVER_DIR)/$$file; \
done
- @for i in bin/*; do chmod +x $(INST_DIR)/$$i; done
- @cp conf/ssl/*.* $(INST_DIR)/conf/ssl
- @test -L $(INST_DIR)/conf/mods-enabled/mpm*load || ln -fs ../mods-available/mpm_worker.load $(INST_DIR)/conf/mods-enabled/
+ @for i in bin/*; do chmod +x $(SERVER_DIR)/$$i; done
+ @cp conf/ssl/*.* $(SERVER_DIR)/conf/ssl
+ @test -L $(SERVER_DIR)/conf/mods-enabled/mpm*load || ln -fs ../mods-available/mpm_worker.load $(SERVER_DIR)/conf/mods-enabled/
@echo done.
- @touch $(INST_DIR)/.test-setup
+ @touch $(SERVER_DIR)/.test-setup
-$(INST_DIR)/conf/ssl/test.example.org.key:
- @mkdir -p $(INST_DIR)/conf/ssl
- openssl genrsa -out $(INST_DIR)/conf/ssl/test.example.org.key 4096
+$(SERVER_DIR)/conf/ssl/test.example.org.key:
+ @mkdir -p $(SERVER_DIR)/conf/ssl
+ openssl genrsa -out $(SERVER_DIR)/conf/ssl/test.example.org.key 4096
-$(INST_DIR)/conf/ssl/test.example.org.req: \
- $(INST_DIR)/conf/ssl/test.example.org.key \
+$(SERVER_DIR)/conf/ssl/test.example.org.req: \
+ $(SERVER_DIR)/conf/ssl/test.example.org.key \
conf/ssl/test.example.org.x509.input
- openssl req -new -key $(INST_DIR)/conf/ssl/test.example.org.key \
- -out $(INST_DIR)/conf/ssl/test.example.org.req < conf/ssl/test.example.org.x509.input
+ openssl req -new -key $(SERVER_DIR)/conf/ssl/test.example.org.key \
+ -out $(SERVER_DIR)/conf/ssl/test.example.org.req < conf/ssl/test.example.org.x509.input
-$(INST_DIR)/conf/ssl/test.example.org.x509.input: \
+$(SERVER_DIR)/conf/ssl/test.example.org.x509.input: \
conf/ssl/test.example.org.x509.input
- cp conf/ssl/test.example.org.x509.input $(INST_DIR)/conf/ssl
+ cp conf/ssl/test.example.org.x509.input $(SERVER_DIR)/conf/ssl
-$(INST_DIR)/conf/ssl/test.example.org.pem: \
- $(INST_DIR)/conf/ssl/test.example.org.key \
- $(INST_DIR)/conf/ssl/test.example.org.req \
+$(SERVER_DIR)/conf/ssl/test.example.org.pem: \
+ $(SERVER_DIR)/conf/ssl/test.example.org.key \
+ $(SERVER_DIR)/conf/ssl/test.example.org.req \
conf/ssl/extensions.conf \
conf/ssl/test.example.org.x509.input
openssl x509 -req -sha256 -days 1095 \
- -signkey $(INST_DIR)/conf/ssl/test.example.org.key \
- -in $(INST_DIR)/conf/ssl/test.example.org.req \
- -out $(INST_DIR)/conf/ssl/test.example.org.pem \
+ -signkey $(SERVER_DIR)/conf/ssl/test.example.org.key \
+ -in $(SERVER_DIR)/conf/ssl/test.example.org.req \
+ -out $(SERVER_DIR)/conf/ssl/test.example.org.pem \
-extfile conf/ssl/extensions.conf -extensions ssl_client < conf/ssl/noh2.example.org.x509.input
-$(INST_DIR)/conf/ssl/test-ser.example.org.key:
- @mkdir -p $(INST_DIR)/conf/ssl
- openssl genrsa -out $(INST_DIR)/conf/ssl/test-ser.example.org.key 4096
+$(SERVER_DIR)/conf/ssl/test-ser.example.org.key:
+ @mkdir -p $(SERVER_DIR)/conf/ssl
+ openssl genrsa -out $(SERVER_DIR)/conf/ssl/test-ser.example.org.key 4096
-$(INST_DIR)/conf/ssl/test-ser.example.org.x509.input: \
+$(SERVER_DIR)/conf/ssl/test-ser.example.org.x509.input: \
conf/ssl/test-ser.example.org.x509.input
- cp conf/ssl/test-ser.example.org.x509.input $(INST_DIR)/conf/ssl
+ cp conf/ssl/test-ser.example.org.x509.input $(SERVER_DIR)/conf/ssl
-$(INST_DIR)/conf/ssl/test-ser.example.org.req: \
- $(INST_DIR)/conf/ssl/test-ser.example.org.key
- openssl req -new -key $(INST_DIR)/conf/ssl/test-ser.example.org.key \
- -out $(INST_DIR)/conf/ssl/test-ser.example.org.req < conf/ssl/test-ser.example.org.x509.input
-
-$(INST_DIR)/conf/ssl/test-ser.example.org.pem: \
- $(INST_DIR)/conf/ssl/test-ser.example.org.key \
- $(INST_DIR)/conf/ssl/test-ser.example.org.req \
+$(SERVER_DIR)/conf/ssl/test-ser.example.org.req: \
+ $(SERVER_DIR)/conf/ssl/test-ser.example.org.key
+ openssl req -new -key $(SERVER_DIR)/conf/ssl/test-ser.example.org.key \
+ -out $(SERVER_DIR)/conf/ssl/test-ser.example.org.req < conf/ssl/test-ser.example.org.x509.input
+
+$(SERVER_DIR)/conf/ssl/test-ser.example.org.pem: \
+ $(SERVER_DIR)/conf/ssl/test-ser.example.org.key \
+ $(SERVER_DIR)/conf/ssl/test-ser.example.org.req \
conf/ssl/extensions.conf \
conf/ssl/test-ser.example.org.x509.input
openssl x509 -req -sha256 -days 1095 \
- -signkey $(INST_DIR)/conf/ssl/test-ser.example.org.key \
- -in $(INST_DIR)/conf/ssl/test-ser.example.org.req \
- -out $(INST_DIR)/conf/ssl/test-ser.example.org.pem \
+ -signkey $(SERVER_DIR)/conf/ssl/test-ser.example.org.key \
+ -in $(SERVER_DIR)/conf/ssl/test-ser.example.org.req \
+ -out $(SERVER_DIR)/conf/ssl/test-ser.example.org.pem \
-extfile conf/ssl/extensions.conf -extensions ssl_client < conf/ssl/noh2.example.org.x509.input
-$(INST_DIR)/conf/ssl/noh2.example.org.key:
- @mkdir -p $(INST_DIR)/conf/ssl
- openssl genrsa -out $(INST_DIR)/conf/ssl/noh2.example.org.key 4096
+$(SERVER_DIR)/conf/ssl/noh2.example.org.key:
+ @mkdir -p $(SERVER_DIR)/conf/ssl
+ openssl genrsa -out $(SERVER_DIR)/conf/ssl/noh2.example.org.key 4096
-$(INST_DIR)/conf/ssl/noh2.example.org.x509.input: \
+$(SERVER_DIR)/conf/ssl/noh2.example.org.x509.input: \
conf/ssl/noh2.example.org.x509.input
- cp conf/ssl/noh2.example.org.x509.input $(INST_DIR)/conf/ssl
+ cp conf/ssl/noh2.example.org.x509.input $(SERVER_DIR)/conf/ssl
-$(INST_DIR)/conf/ssl/noh2.example.org.req: \
- $(INST_DIR)/conf/ssl/noh2.example.org.key
- openssl req -new -key $(INST_DIR)/conf/ssl/noh2.example.org.key \
- -out $(INST_DIR)/conf/ssl/noh2.example.org.req < conf/ssl/noh2.example.org.x509.input
-
-$(INST_DIR)/conf/ssl/noh2.example.org.pem: \
- $(INST_DIR)/conf/ssl/noh2.example.org.key \
- $(INST_DIR)/conf/ssl/noh2.example.org.req \
+$(SERVER_DIR)/conf/ssl/noh2.example.org.req: \
+ $(SERVER_DIR)/conf/ssl/noh2.example.org.key
+ openssl req -new -key $(SERVER_DIR)/conf/ssl/noh2.example.org.key \
+ -out $(SERVER_DIR)/conf/ssl/noh2.example.org.req < conf/ssl/noh2.example.org.x509.input
+
+$(SERVER_DIR)/conf/ssl/noh2.example.org.pem: \
+ $(SERVER_DIR)/conf/ssl/noh2.example.org.key \
+ $(SERVER_DIR)/conf/ssl/noh2.example.org.req \
conf/ssl/extensions.conf \
conf/ssl/noh2.example.org.x509.input
openssl x509 -req -sha256 -days 1095 \
- -signkey $(INST_DIR)/conf/ssl/noh2.example.org.key \
- -in $(INST_DIR)/conf/ssl/noh2.example.org.req \
- -out $(INST_DIR)/conf/ssl/noh2.example.org.pem \
+ -signkey $(SERVER_DIR)/conf/ssl/noh2.example.org.key \
+ -in $(SERVER_DIR)/conf/ssl/noh2.example.org.req \
+ -out $(SERVER_DIR)/conf/ssl/noh2.example.org.pem \
-extfile conf/ssl/extensions.conf -extensions ssl_client < conf/ssl/noh2.example.org.x509.input
################################################################################
# Install the local curl
#
-$(INST_DIR)/.curl-installed:
+$(SERVER_DIR)/.curl-installed:
make -C clients
Propchange: httpd/test/mod_h2/trunk/clients/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jul 14 12:50:42 2015
@@ -1 +1,3 @@
gen
+Makefile
+Makefile.in
Added: httpd/test/mod_h2/trunk/clients/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/clients/Makefile.am?rev=1690916&view=auto
==============================================================================
--- httpd/test/mod_h2/trunk/clients/Makefile.am (added)
+++ httpd/test/mod_h2/trunk/clients/Makefile.am Tue Jul 14 12:50:42 2015
@@ -0,0 +1,96 @@
+# Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+CURL_VERSION = 7.43.0
+CURL_DIR = curl-$(CURL_VERSION)
+CURL_TAR = $(CURL_DIR).tar.gz
+CURL_URL = http://curl.haxx.se/download/$(CURL_TAR)
+
+GEN = gen
+
+CURL_CONF = @CURL_CONF@
+
+all: install-curl
+
+dirs:
+ @mkdir -p $(GEN)/build
+
+clean:
+ @rm -rf $(GEN)/$(CURL_DIR) $(GEN)/build.log
+
+distclean:
+ @rm -rf $(GEN)
+
+install: install-curl
+
+install-curl: $(GEN)/.curl-installed
+
+################################################################################
+# Install the local curl our tests
+#
+$(GEN)/.curl-installed: $(GEN)/$(CURL_DIR)/.curl-built
+ @echo -n installing curl locally...
+ @cd $(GEN)/$(CURL_DIR)/ && make install >> ../build.log
+ @echo done.
+ @touch $(GEN)/.curl-installed
+
+
+################################################################################
+# Build the local curl
+#
+$(GEN)/$(CURL_DIR)/.curl-built: \
+ $(GEN)/$(CURL_DIR)/.curl-configured
+ @echo -n building curl...
+ @cd $(GEN)/$(CURL_DIR)/ && make >> ../build.log
+ @echo done.
+ @touch $(GEN)/$(CURL_DIR)/.curl-built
+
+################################################################################
+# Configure the local curl sources
+#
+
+PKG_CONF_MSG = Unable to find pkg-config executable. You need pkg-config installed \
+for curl to be built with nghttp2. On OS X try: \"brew install pkg-config\" \
+on Linux you local package manager should be able to help.
+
+$(GEN)/$(CURL_DIR)/.curl-configured: \
+ $(CURL_DEPS) \
+ $(GEN)/$(CURL_DIR)/.curl-extracted
+ @echo -n configuring curl...
+ if test ! -x $$( type -p pkg-config ); then echo $(PKG_CONF_MSG); exit 1; fi
+ cd $(GEN)/$(CURL_DIR)/ && \
+ PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig ./configure --prefix=$(prefix) $(CURL_CONF)
+ @echo done.
+ @touch $(GEN)/$(CURL_DIR)/.curl-configured
+
+################################################################################
+# Extract curl source tree
+#
+$(GEN)/$(CURL_DIR)/.curl-extracted: \
+ $(GEN)/$(CURL_TAR)
+ @rm -rf $(GEN)/$(CURL_DIR)
+ @echo -n extracting curl packages...
+ @cd $(GEN) && tar xfz $(CURL_TAR)
+ @echo done.
+ @touch $(GEN)/$(CURL_DIR)/.curl-extracted
+
+################################################################################
+# Retrieve curl sources, we use curl for that???
+#
+$(GEN)/$(CURL_TAR):
+ @mkdir -p $(GEN)
+ curl --progress-bar $(CURL_URL) > $(GEN)/$(CURL_TAR)
+
+
Modified: httpd/test/mod_h2/trunk/conf/httpd.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/httpd.conf?rev=1690916&r1=1690915&r2=1690916&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/httpd.conf (original)
+++ httpd/test/mod_h2/trunk/conf/httpd.conf Tue Jul 14 12:50:42 2015
@@ -18,14 +18,14 @@ IncludeOptional conf/mods-enabled/*.conf
ServerAdmin you@localhost
-<Directory />
- AllowOverride none
- Require all denied
-</Directory>
+ErrorLog "logs/error_log"
+LogLevel warn
+
+CoreDumpDirectory "/tmp"
DocumentRoot "SUBST_SERVER_ROOT_SUBST/htdocs"
<Directory "SUBST_SERVER_ROOT_SUBST/htdocs">
- Options Indexes FollowSymLinks
+ Options Indexes FollowSymLinks
AllowOverride None
Require all granted
</Directory>
@@ -34,15 +34,11 @@ DocumentRoot "SUBST_SERVER_ROOT_SUBST/ht
DirectoryIndex index.html
DirectoryIndex index.php
</IfModule>
+
<Files ".ht*">
Require all denied
</Files>
-ErrorLog "logs/error_log"
-LogLevel warn
-
-CoreDumpDirectory "/tmp"
-
<IfModule log_config_module>
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
LogFormat "%h %l %u %t \"%r\" %>s %b" common
@@ -50,9 +46,9 @@ CoreDumpDirectory "/tmp"
</IfModule>
<IfModule alias_module>
- ScriptAlias /cgi-bin/ "SUBST_SERVER_ROOT_SUBST/cgi-bin/"
+ ScriptAlias /cgi-bin/ "cgi-bin/"
</IfModule>
-<Directory "SUBST_SERVER_ROOT_SUBST/cgi-bin">
+<Directory "cgi-bin">
AllowOverride None
Options None
Require all granted
@@ -119,7 +115,7 @@ CoreDumpDirectory "/tmp"
SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK
SSLProtocol All -SSLv2 -SSLv3
SSLPassPhraseDialog builtin
- SSLSessionCache "shmcb:SUBST_SERVER_ROOT_SUBST/logs/ssl_scache(512000)"
+ SSLSessionCache "shmcb:logs/ssl_scache(512000)"
SSLSessionCacheTimeout 300
SSLRandomSeed startup builtin
Modified: httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf?rev=1690916&r1=1690915&r2=1690916&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf (original)
+++ httpd/test/mod_h2/trunk/conf/sites/aaa-noh2.example.org.conf Tue Jul 14 12:50:42 2015
@@ -10,8 +10,8 @@
DocumentRoot "SUBST_SERVER_ROOT_SUBST/htdocs/test.example.org"
SSLEngine on
- SSLCertificateFile SUBST_SERVER_ROOT_SUBST/conf/ssl/noh2.example.org.pem
- SSLCertificateKeyFile SUBST_SERVER_ROOT_SUBST/conf/ssl/noh2.example.org.key
+ SSLCertificateFile conf/ssl/noh2.example.org.pem
+ SSLCertificateKeyFile conf/ssl/noh2.example.org.key
RewriteEngine on
RewriteRule ^/latest.tar.gz$ /xxx-1.0.2a.tar.gz [R=302,NC]
Modified: httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf?rev=1690916&r1=1690915&r2=1690916&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf (original)
+++ httpd/test/mod_h2/trunk/conf/sites/test-ser.example.org.conf Tue Jul 14 12:50:42 2015
@@ -15,8 +15,8 @@
SSLProtocol +TLSv1 +TLSv1.1 +TLSv1.2
SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK
SSLHonorCipherOrder on
- SSLCertificateFile SUBST_SERVER_ROOT_SUBST/conf/ssl/test-ser.example.org.pem
- SSLCertificateKeyFile SUBST_SERVER_ROOT_SUBST/conf/ssl/test-ser.example.org.key
+ SSLCertificateFile conf/ssl/test-ser.example.org.pem
+ SSLCertificateKeyFile conf/ssl/test-ser.example.org.key
RewriteEngine on
RewriteRule ^/latest.tar.gz$ /xxx-1.0.2a.tar.gz [R=302,NC]
Modified: httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf?rev=1690916&r1=1690915&r2=1690916&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf (original)
+++ httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf Tue Jul 14 12:50:42 2015
@@ -27,8 +27,8 @@
SSLProtocol +TLSv1 +TLSv1.1 +TLSv1.2
SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK
SSLHonorCipherOrder on
- SSLCertificateFile SUBST_SERVER_ROOT_SUBST/conf/ssl/test.example.org.pem
- SSLCertificateKeyFile SUBST_SERVER_ROOT_SUBST/conf/ssl/test.example.org.key
+ SSLCertificateFile conf/ssl/test.example.org.pem
+ SSLCertificateKeyFile conf/ssl/test.example.org.key
RewriteEngine on
RewriteRule ^/latest.tar.gz$ /xxx-1.0.2a.tar.gz [R=302,NC]
Modified: httpd/test/mod_h2/trunk/configure.ac
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/configure.ac?rev=1690916&r1=1690915&r2=1690916&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Tue Jul 14 12:50:42 2015
@@ -42,6 +42,8 @@ AM_INIT_AUTOMAKE([subdir-objects no-defi
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+OS=$( uname -s )
+
AC_ARG_ENABLE([werror],
[AS_HELP_STRING([--enable-werror],
[Turn on compile time warnings])],
@@ -51,6 +53,28 @@ AC_ARG_WITH([apxs], [AS_HELP_STRING([--w
[Use APXS executable [default=check]])],
[request_apxs=$withval], [request_apxs=check])
+AC_ARG_WITH([serverdir], [AS_HELP_STRING([--with-serverdir],
+ [Use serverdir directory for setup [default=gen/apache]])],
+ [request_serverdir=$withval], [request_serverdir=$PWD/gen/apache])
+
+
+export BUILD_SUBDIRS="nghttp2 clients"
+
+AC_MSG_NOTICE("configuring build")
+
+if test x"$request_apxs" = "xcheck"; then
+ AC_PATH_PROG([APXS], [apxs])
+ if test "x${APXS}" = "x"; then
+ AC_MSG_ERROR("no APXS installation found")
+ fi
+ # we have found an axps, use it
+ if test "$prefix" = "$ac_default_prefix"; then
+ prefix="$PWD/gen/apache"
+ fi
+else
+ APXS="$request_apxs"
+ AC_MSG_NOTICE("using APXS=$APXS as configured")
+fi
# Checks for programs.
AC_PROG_CC
@@ -88,40 +112,93 @@ if test "x$werror" != "xno"; then
fi
-export BUILD_SUBDIRS="nghttp2 clients"
-
-AC_MSG_NOTICE("configuring build")
-
-if test x"$request_apxs" = "xcheck"; then
- AC_PATH_PROG([APXS], [apxs])
- if test "x${APXS}" = "x"; then
- AC_MSG_ERROR("no APXS installation found")
+if test -x "${APXS}"; then
+ if test "$prefix" = "NONE"; then
+ prefix="$($APXS -q prefix)"
+ AC_MSG_NOTICE("using apxs queried prefix=$prefix")
fi
+ ap_prefix="$($APXS -q prefix)"
+ ap_bindir="$($APXS -q bindir)"
+ MODULES="$($APXS -q libexecdir)"
+ APACHECTL="$ap_bindir/apachectl"
+ HTTPD="$ap_bindir/httpd"
+
+ LDFLAGS="$LDFLAGS -L$($APXS -q libdir)"
+ CPPFLAGS="$CPPFLAGS -I$($APXS -q includedir) -I$($APXS -q APR_INCLUDEDIR)"
+ export SYSCONF_DIR="$($APXS -q sysconfdir)"
+ export LIBEXEC_DIR="$($APXS -q LIBEXECDIR)"
else
- APXS="$request_apxs"
- AC_MSG_NOTICE("using APXS=$APXS as configured")
+ if test "$prefix" = "NONE"; then
+ prefix="$(dirname $(dirname $APXS))"
+ AC_MSG_NOTICE("guessing prefix=$prefix")
+ fi
+ ap_prefix="$(dirname $(dirname $APXS))"
+ ap_bindir="$(dirname $APXS)"
+ MODULES="${ap_prefix}/modules"
+ APACHECTL="${ap_bindir}/apachectl"
+ HTTPD="${ap_bindir}/httpd"
+
+ LDFLAGS="$LDFLAGS -L${ap_prefix}/lib"
+ CPPFLAGS="$CPPFLAGS -I${ap_prefix}/include"
+ export SYSCONF_DIR="${ap_prefix}/conf"
+ export LIBEXEC_DIR="$MODULES"
fi
-prefix="$($APXS -q prefix)"
-bindir="$($APXS -q bindir)"
-MODULES="$($APXS -q libexecdir)"
-
-APACHECTL="$bindir/apachectl"
-HTTPD="$bindir/httpd"
-
-LDFLAGS="$LDFLAGS -L$($APXS -q libdir)"
-CPPFLAGS="$CPPFLAGS -I$($APXS -q includedir) -I$($APXS -q APR_INCLUDEDIR)"
-export SYSCONF_DIR="$($APXS -q sysconfdir)"
-export LIBEXEC_DIR="$($APXS -q LIBEXECDIR)"
-
SERVER_NAME=$(hostname -f)
-ABS_PWD=$PWD
+SERVER_DIR="$request_serverdir"
AC_PATH_PROG([PHPCGI], [php-cgi])
if test "x${PHPCGI}" = "x"; then
AC_MSG_ERROR("no php-cgi installation found")
fi
+################################################################################
+# nghttp2
+################################################################################
+
+NGHTTP2_VERSION=1.0.5
+NGHTTP2_DEPS=""
+if test "$OS" = "Darwin"; then
+ NGHTTP2_DEPS="gen/.zlib-installed gen/.libev-installed"
+elif test ! -f "${prefix}/lib/pkgconfig/openssl.pc"; then
+ NGHTTP2_DEPS="gen/.libevent-installed"
+fi
+
+################################################################################
+# openssl
+################################################################################
+
+AC_PATH_PROG([OPENSSL], [openssl])
+if test "x${OPENSSL}" = "x"; then
+ OPENSSL_VERSION="na"
+else
+ OPENSSL_VERSION=$( ${OPENSSL} version -v | sed -e 's/OpenSSL *//g' -e 's/[a-z]* .*//g')
+fi
+
+OPENSSL_SRC="installed"
+case "$OPENSSL_VERSION" in
+ 1.0.2*)
+ # acceptable
+ ;;
+ *)
+ OPENSSL_VERSION="1.0.2d"
+ OPENSSL_SRC="download+install in $prefix"
+ NGHTTP2_DEPS="$NGHTTP2_DEPS gen/.openssl-installed"
+ CURL_CONF='--with-nghttp2=$(prefix) --with-ssl=$(prefix)'
+ if test "$OS" = "Darwin"; then
+ OPENSSL_CONF_CMD="./Configure"
+ OPENSSL_CONF="darwin64-x86_64-cc"
+ else
+ OPENSSL_CONF_CMD="./config"
+ OPENSSL_CONF="shared -fPIC"
+ fi
+ ;;
+esac
+
+
+################################################################################
+# generate files
+################################################################################
# substitution in generated files
AC_SUBST(BUILD_SUBDIRS)
@@ -133,9 +210,18 @@ AC_SUBST(PHPCGI)
AC_SUBST(APACHECTL)
AC_SUBST(HTTPD)
AC_SUBST(MODULES)
+AC_SUBST(SERVER_DIR)
+AC_SUBST(NGHTTP2_DEPS)
+AC_SUBST(OPENSSL_CONF_CMD)
+AC_SUBST(OPENSSL_CONF)
+AC_SUBST(CURL_CONF)
+AC_SUBST(OPENSSL_VERSION)
+AC_SUBST(NGHTTP2_VERSION)
AC_CONFIG_FILES([
Makefile
+ nghttp2/Makefile
+ clients/Makefile
])
AC_OUTPUT
@@ -144,5 +230,8 @@ AC_MSG_NOTICE([summary of build options:
Version: ${VERSION} shared $LT_CURRENT:$LT_REVISION:$LT_AGE
Host type: ${host}
+ prefix: ${prefix}
APXS: ${APXS}
+ nghttp2: ${NGHTTP2_VERSION} (download+install in $prefix)
+ OPENSSL: ${OPENSSL_VERSION} (${OPENSSL_SRC})
])
Propchange: httpd/test/mod_h2/trunk/nghttp2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jul 14 12:50:42 2015
@@ -1 +1,3 @@
gen
+Makefile
+Makefile.in
Added: httpd/test/mod_h2/trunk/nghttp2/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/nghttp2/Makefile.am?rev=1690916&view=auto
==============================================================================
--- httpd/test/mod_h2/trunk/nghttp2/Makefile.am (added)
+++ httpd/test/mod_h2/trunk/nghttp2/Makefile.am Tue Jul 14 12:50:42 2015
@@ -0,0 +1,269 @@
+# Copyright 2015 greenbytes GmbH (https://www.greenbytes.de)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+GEN = gen
+CURL_OPTS = --progress-bar
+
+NGHTTP2_VERSION = @NGHTTP2_VERSION@
+NGHTTP2_DIR = nghttp2-$(NGHTTP2_VERSION)
+NGHTTP2_TAR = $(NGHTTP2_DIR).tar.gz
+NGHTTP2_URL = https://github.com/tatsuhiro-t/nghttp2/releases/download/v$(NGHTTP2_VERSION)/$(NGHTTP2_TAR)
+
+NGHTTP2_CONF_ENV=
+NGHTTP2_DEPS = @NGHTTP2_DEPS@
+NGHTTP2_CONF = --prefix=$(prefix) --enable-app
+
+ZLIB_VERSION = 1.2.8
+ZLIB_DIR = zlib-$(ZLIB_VERSION)
+ZLIB_TAR = $(ZLIB_DIR).tar.gz
+ZLIB_URL = http://zlib.net/$(ZLIB_TAR)
+
+LIBEV_VERSION = 4.20
+LIBEV_DIR = libev-$(LIBEV_VERSION)
+LIBEV_TAR = $(LIBEV_DIR).tar.gz
+LIBEV_URL = http://dist.schmorp.de/libev/$(LIBEV_TAR)
+LIBEV_CONF_ENV = PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \
+ LDFLAGS=-L$(prefix)/lib CFLAGS=-I$(prefix)/include
+
+LIBEVENT_VERSION = 2.0.22-stable
+LIBEVENT_DIR = libevent-$(LIBEVENT_VERSION)
+LIBEVENT_TAR = $(LIBEVENT_DIR).tar.gz
+LIBEVENT_URL = https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/$(LIBEVENT_TAR)
+LIBEVENT_CONF_ENV = PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \
+ LDFLAGS=-L$(prefix)/lib CFLAGS=-I$(prefix)/include
+
+
+OPENSSL_VERSION = 1.0.2d
+OPENSSL_BASE = http://www.openssl.org
+OPENSSL_DIR = openssl-$(OPENSSL_VERSION)
+OPENSSL_TAR = $(OPENSSL_DIR).tar.gz
+OPENSSL_URL = $(OPENSSL_BASE)/source/$(OPENSSL_TAR)
+OPENSSL_CONF_CMD = @OPENSSL_CONF_CMD@
+OPENSSL_CONF = @OPENSSL_CONF@
+
+
+NGHTTP2_CONF_ENV += PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \
+ LDFLAGS=-L$(prefix)/lib CFLAGS=-I$(prefix)/include
+
+
+all: install
+
+dirs:
+ @mkdir -p $(GEN)/build
+
+clean:
+ @rm -rf $(GEN)/$(NGHTTP2_DIR)
+
+distclean:
+ @rm -rf $(GEN)
+
+distdir:
+ @mkdir -p $(distdir)
+ @tar cf - Makefile patches | (cd $(distdir) && tar xf - )
+
+install: $(GEN)/.nghttp2-installed
+
+
+################################################################################
+# Install the local nghttp2
+#
+$(GEN)/.nghttp2-installed: $(GEN)/$(NGHTTP2_DIR)/.nghttp2-built
+ @echo -n installing nghttp2 locally...
+ @cd $(GEN)/$(NGHTTP2_DIR)/ && make install
+ @echo done.
+ @touch $(GEN)/.nghttp2-installed
+
+
+################################################################################
+# Build the local nghttp2
+#
+$(GEN)/$(NGHTTP2_DIR)/.nghttp2-built: \
+ $(GEN)/$(NGHTTP2_DIR)/.nghttp2-configured
+ @echo -n building nghttp2...
+ @cd $(GEN)/$(NGHTTP2_DIR)/ && make
+ @echo done.
+ @touch $(GEN)/$(NGHTTP2_DIR)/.nghttp2-built
+
+################################################################################
+# Configure the local nghttp2 sources
+#
+$(GEN)/$(NGHTTP2_DIR)/.nghttp2-configured: \
+ $(NGHTTP2_DEPS) \
+ $(GEN)/$(NGHTTP2_DIR)/.nghttp2-patched
+ @echo -n configuring nghttp2...
+ cd $(GEN)/$(NGHTTP2_DIR)/ && \
+ $(NGHTTP2_CONF_ENV) ./configure $(NGHTTP2_CONF)
+ @echo done.
+ @touch $(GEN)/$(NGHTTP2_DIR)/.nghttp2-configured
+
+################################################################################
+# Patch the local nghtp2 sources
+#
+$(GEN)/$(NGHTTP2_DIR)/.nghttp2-patched: \
+ $(GEN)/$(NGHTTP2_DIR)/.nghttp2-extracted
+ @touch $(GEN)/$(NGHTTP2_DIR)/.nghttp2-patched
+
+################################################################################
+# Extract nghttp2 source tree
+#
+$(GEN)/$(NGHTTP2_DIR)/.nghttp2-extracted: \
+ $(GEN)/$(NGHTTP2_TAR)
+ @rm -rf $(GEN)/$(NGHTTP2_DIR)
+ @echo -n extracting nghttp2 packages...
+ @cd $(GEN) && tar xfz $(NGHTTP2_TAR)
+ @echo done.
+ @touch $(GEN)/$(NGHTTP2_DIR)/.nghttp2-extracted
+
+################################################################################
+# Retrieve nghttp2 sources
+#
+$(GEN)/$(NGHTTP2_TAR):
+ @mkdir -p $(GEN)
+ curl $(CURL_OPTS) -L $(NGHTTP2_URL) > $(GEN)/$(NGHTTP2_TAR)
+
+
+################################################################################
+# Build + install a local opensll library (if needed)
+#
+$(GEN)/.openssl-installed: \
+ $(GEN)/$(OPENSSL_DIR)/.built
+ @mkdir -p $(GEN)
+ @echo -n installing openssl locally, may take some time...
+ @cd $(GEN)/$(OPENSSL_DIR) && make install_sw
+ @echo done.
+ @touch $(GEN)/.openssl-installed
+
+$(GEN)/$(OPENSSL_DIR)/.built: \
+ $(GEN)/$(OPENSSL_DIR)/.configured
+ @echo -n building openssl locally...
+ @cd $(GEN)/$(OPENSSL_DIR) && make
+ @echo done.
+ @touch $(GEN)/$(OPENSSL_DIR)/.built
+
+$(GEN)/$(OPENSSL_DIR)/.configured: \
+ $(GEN)/$(OPENSSL_DIR)/.patched
+ @echo -n configuring openssl...
+ cd $(GEN)/$(OPENSSL_DIR) && $(OPENSSL_CONF_CMD) --openssldir=$(prefix) $(OPENSSL_CONF)
+ @echo done.
+ @touch $(GEN)/$(OPENSSL_DIR)/.configured
+
+$(GEN)/$(OPENSSL_DIR)/.patched: \
+ $(GEN)/$(OPENSSL_DIR)/.extracted
+ @echo applying patches...
+ @echo openssl patched.
+ @touch $(GEN)/$(OPENSSL_DIR)/.patched
+
+$(GEN)/$(OPENSSL_DIR)/.extracted:
+ @echo -n downloading and extracting openssl...
+ @mkdir -p $(GEN)
+ curl $(CURL_OPTS) -L $(OPENSSL_URL) > $(GEN)/$(OPENSSL_TAR)
+ @cd gen; tar xfz $(OPENSSL_TAR)
+ @echo done.
+ @touch $(GEN)/$(OPENSSL_DIR)/.extracted
+
+################################################################################
+# Build + install a local libevent library (if needed)
+#
+$(GEN)/.libevent-installed: \
+ $(GEN)/$(LIBEVENT_DIR)/.libevent-built
+ @echo -n installing libevent locally...
+ @cd $(GEN)/$(LIBEVENT_DIR) && make install
+ @echo done.
+ @touch $(GEN)/.libevent-installed
+
+$(GEN)/$(LIBEVENT_DIR)/.libevent-built: \
+ $(GEN)/$(LIBEVENT_DIR)/.libevent-configured
+ @echo -n building libevent locally...
+ @cd $(GEN)/$(LIBEVENT_DIR) && make
+ @echo done.
+ @touch $(GEN)/$(LIBEVENT_DIR)/.libevent-built
+
+$(GEN)/$(LIBEVENT_DIR)/.libevent-configured: \
+ $(GEN)/$(LIBEVENT_DIR)/.libevent-extracted
+ @echo -n configuring libevent...
+ @cd $(GEN)/$(LIBEVENT_DIR) && $(LIBEVENT_CONF_ENV) ./configure --prefix=$(prefix) --with-sysroot=$(prefix)
+ @echo done.
+ @touch $(GEN)/$(LIBEVENT_DIR)/.libevent-configured
+
+$(GEN)/$(LIBEVENT_DIR)/.libevent-extracted: \
+ $(GEN)/$(LIBEVENT_TAR)
+ @rm -rf $(GEN)/$(LIBEVENT_DIR)
+ @echo -n downloading and extracting libevent...
+ @cd gen; tar xfz $(LIBEVENT_TAR)
+ @echo done.
+ @touch $(GEN)/$(LIBEVENT_DIR)/.libevent-extracted
+
+$(GEN)/$(LIBEVENT_TAR):
+ @mkdir -p $(GEN)
+ curl $(CURL_OPTS) -L $(LIBEVENT_URL) > $(GEN)/$(LIBEVENT_TAR)
+
+################################################################################
+# Build + install a local libev library (if needed)
+#
+$(GEN)/.libev-installed: \
+ $(GEN)/$(LIBEV_DIR)/.libev-built
+ @echo -n installing libev locally...
+ @cd $(GEN)/$(LIBEV_DIR) && make install
+ @echo done.
+ @touch $(GEN)/.libev-installed
+
+$(GEN)/$(LIBEV_DIR)/.libev-built: \
+ $(GEN)/$(LIBEV_DIR)/.libev-configured
+ @echo -n building libev locally...
+ @cd $(GEN)/$(LIBEV_DIR) && make
+ @echo done.
+ @touch $(GEN)/$(LIBEV_DIR)/.libev-built
+
+$(GEN)/$(LIBEV_DIR)/.libev-configured: $(GEN)/$(LIBEV_TAR)
+ @rm -rf $(GEN)/$(LIBEV_DIR)
+ @cd $(GEN) && tar xfz $(LIBEV_TAR)
+ @echo -n configuring libev...
+ @cd $(GEN)/$(LIBEV_DIR) && $(LIBEV_CONF_ENV) ./configure --prefix=$(prefix)
+ @echo done.
+ @touch $(GEN)/$(LIBEV_DIR)/.libev-configured
+
+$(GEN)/$(LIBEV_TAR):
+ @mkdir -p $(GEN)
+ curl $(CURL_OPTS) -L $(LIBEV_URL) > $(GEN)/$(LIBEV_TAR)
+
+################################################################################
+# Build + install a local zlib library (if needed)
+#
+$(GEN)/.zlib-installed: \
+ $(GEN)/$(ZLIB_DIR)/.zlib-built
+ @echo -n installing zlib locally...
+ @cd $(GEN)/$(ZLIB_DIR) && make install
+ @echo done.
+ @touch $(GEN)/.zlib-installed
+
+$(GEN)/$(ZLIB_DIR)/.zlib-built: \
+ $(GEN)/$(ZLIB_DIR)/.zlib-configured
+ @echo -n building zlib locally...
+ @cd $(GEN)/$(ZLIB_DIR) && make
+ @echo done.
+ @touch $(GEN)/$(ZLIB_DIR)/.zlib-built
+
+$(GEN)/$(ZLIB_DIR)/.zlib-configured: $(GEN)/$(ZLIB_TAR)
+ @rm -rf $(GEN)/$(ZLIB_DIR)
+ @cd $(GEN) && tar xfz $(ZLIB_TAR)
+ @echo -n configuring zlib...
+ @cd $(GEN)/$(ZLIB_DIR) && ./configure --prefix=$(prefix)
+ @echo done.
+ @touch $(GEN)/$(ZLIB_DIR)/.zlib-configured
+
+$(GEN)/$(ZLIB_TAR):
+ @mkdir -p $(GEN)
+ curl $(CURL_OPTS) -L $(ZLIB_URL) > $(GEN)/$(ZLIB_TAR)
+
Modified: httpd/test/mod_h2/trunk/test/test_common.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_common.sh?rev=1690916&r1=1690915&r2=1690916&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_common.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_common.sh Tue Jul 14 12:50:42 2015
@@ -27,7 +27,7 @@ if [ "$URL_PATH" = "/$AUTH" ]; then
URL_PATH=""
fi
-INSTALL_DIR="gen/apache"
+INSTALL_DIR="${PREFIX:-gen/apache}"
BIN_DIR="${INSTALL_DIR}/bin"
if [ "${HOST#*.}" = 'example.org' ]; then
DOC_ROOT="htdocs/test.example.org"