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 2018/07/05 08:07:36 UTC
svn commit: r1835103 - in /httpd/test/mod_h2/trunk: Makefile.am
bin/php-wrapper conf/httpd.conf configure.ac
Author: icing
Date: Thu Jul 5 08:07:36 2018
New Revision: 1835103
URL: http://svn.apache.org/viewvc?rev=1835103&view=rev
Log:
* removing no longer needed check for php-cgi
* using nghttp/h2load executable from $prefix, as default, over system installed ones
Removed:
httpd/test/mod_h2/trunk/bin/php-wrapper
Modified:
httpd/test/mod_h2/trunk/Makefile.am
httpd/test/mod_h2/trunk/conf/httpd.conf
httpd/test/mod_h2/trunk/configure.ac
Modified: httpd/test/mod_h2/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/Makefile.am?rev=1835103&r1=1835102&r2=1835103&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/Makefile.am Thu Jul 5 08:07:36 2018
@@ -352,7 +352,6 @@ $(SERVER_DIR)/.test-setup: \
-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 > $(SERVER_DIR)/$$file; \
done
@for i in bin/*; do chmod +x $(SERVER_DIR)/$$i; done
@@ -442,7 +441,6 @@ $(GEN)/php-fpm/.setup: \
-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" \
< php-fpm/www.conf > $(GEN)/php-fpm/www.conf
Modified: httpd/test/mod_h2/trunk/conf/httpd.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/httpd.conf?rev=1835103&r1=1835102&r2=1835103&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/httpd.conf (original)
+++ httpd/test/mod_h2/trunk/conf/httpd.conf Thu Jul 5 08:07:36 2018
@@ -163,7 +163,7 @@ DocumentRoot "SUBST_SERVER_ROOT_SUBST/ht
<IfVersion >= 2.5.0>
SSLPolicy modern
- SSLCipherSuite TLSv1.3 TLS_AES_128_GCM_SHA256
+ #SSLCipherSuite TLSv1.3 TLS_AES_128_GCM_SHA256
# disable proxy cert verification in this test setup
SSLProxyVerify none
Modified: httpd/test/mod_h2/trunk/configure.ac
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/configure.ac?rev=1835103&r1=1835102&r2=1835103&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/configure.ac (original)
+++ httpd/test/mod_h2/trunk/configure.ac Thu Jul 5 08:07:36 2018
@@ -121,11 +121,6 @@ fi
SERVER_NAME=$(hostname -f)
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
-
INSTALL_DEP=""
INSTALL_ADDITIONAL=""
TEST_DEP=""
@@ -216,23 +211,25 @@ AC_TRY_COMPILE([#include <nghttp2/nghttp
[AC_MSG_RESULT(FAILED)])
if test "x$ac_cv_nghttp2" = "xyes"; then
- AC_PATH_PROG([NGHTTP], [nghttp])
- if test "x${NGHTTP}" = "x"; then
+ if test -x "${prefix}/bin/nghttp"; then
NGHTTP="${prefix}/bin/nghttp"
- if test ! -x "${NGHTTP}"; then
+ else
+ AC_PATH_PROG([NGHTTP], [nghttp])
+ if test "x${NGHTTP}" = "x"; then
AC_MSG_WARN([no nghttp executable found])
ac_cv_nghttp2=no
fi
- NGHTTP2_VERSION=$( $NGHTTP --version )
- NGHTTP2_VERSION=${NGHTTP2_VERSION##*/}
- NGHTTP_INSTALLED="$NGHTTP ($NGHTTP2_VERSION)"
fi
+ NGHTTP2_VERSION=$( $NGHTTP --version )
+ NGHTTP2_VERSION=${NGHTTP2_VERSION##*/}
+ NGHTTP_INSTALLED="$NGHTTP ($NGHTTP2_VERSION)"
fi
if test "x$ac_cv_nghttp2" = "xyes"; then
- AC_PATH_PROG([H2LOAD], [h2load])
- if test "x${H2LOAD}" = "x"; then
+ if test -x "${prefix}/bin/h2load"; then
H2LOAD="${prefix}/bin/h2load"
- if test ! -x "${H2LOAD}"; then
+ else
+ AC_PATH_PROG([H2LOAD], [h2load])
+ if test "x${H2LOAD}" = "x"; then
AC_MSG_WARN([no h2load executable found])
ac_cv_nghttp2=no
fi
@@ -372,7 +369,6 @@ AC_SUBST(LIB_DIR)
AC_SUBST(LIBEXEC_DIR)
AC_SUBST(SERVER_NAME)
AC_SUBST(ABS_PWD)
-AC_SUBST(PHPCGI)
AC_SUBST(APXS)
AC_SUBST(APACHECTL)
AC_SUBST(HTTPD)