hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1774761 - in /httpcomponents/httpcore/trunk: ./ httpcore5-testing-compat/docker/ httpcore5-testing-compat/docker/apache-httpd/ httpcore5-testing-compat/docker/nginx/ httpcore5-testing-compat/src/test/java/org/apache/hc/core5/compatibility/...
Date Sat, 17 Dec 2016 14:15:14 GMT
Author: olegk
Date: Sat Dec 17 14:15:14 2016
New Revision: 1774761

URL: http://svn.apache.org/viewvc?rev=1774761&view=rev
Log:
Docker based HTTP/2 compatibility tests for Apache HTTP server and Nginx server

Added:
    httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/
    httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/BUILDING.txt   (with props)
    httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/
    httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/.dockerignore
    httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/Dockerfile
    httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/httpd.conf
    httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/
    httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/.dockerignore
    httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/Dockerfile
    httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/default.conf
    httpcomponents/httpcore/trunk/httpcore5-testing-compat/src/test/java/org/apache/hc/core5/compatibility/http2/Http2CompatibilityTest.java
  (with props)
Modified:
    httpcomponents/httpcore/trunk/pom.xml

Added: httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/BUILDING.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/BUILDING.txt?rev=1774761&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/BUILDING.txt (added)
+++ httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/BUILDING.txt Sat Dec 17
14:15:14 2016
@@ -0,0 +1,23 @@
+Building Docker containers for compatibility tests
+========================================================
+
+Remark: Docker containers have been developed and tested with Docker version 1.12.4, build
1564f02
+on Debian Linux 8.6
+
+Remark: omit sudo command if executing as root
+
+---
+cd docker/apache-httpd
+sudo docker build -t hc-tests-httpd .
+sudo docker run --name my-hc-tests-httpd -p 0.0.0.0:8080:8080 -d hc-tests-httpd:latest
+
+cd docker/nginx
+sudo docker build -t hc-tests-nginx .
+sudo docker run --name my-hc-tests-nginx -p 0.0.0.0:8081:8081 -d hc-tests-nginx:latest
+---
+
+Execute
+
+---
+Http2CompatibilityTest http://localhost:8080 APACHE-HTTPD
+Http2CompatibilityTest http://localhost:8081 NGINX
\ No newline at end of file

Propchange: httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/BUILDING.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/BUILDING.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/BUILDING.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/.dockerignore
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/.dockerignore?rev=1774761&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/.dockerignore
(added)
+++ httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/.dockerignore
Sat Dec 17 14:15:14 2016
@@ -0,0 +1 @@
+*/*/.svn

Added: httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/Dockerfile
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/Dockerfile?rev=1774761&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/Dockerfile
(added)
+++ httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/Dockerfile
Sat Dec 17 14:15:14 2016
@@ -0,0 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
+FROM httpd:2.4
+MAINTAINER dev@hc.apache.org
+
+ENV var_dir /var/httpd
+ENV www_dir ${var_dir}/www
+
+RUN apt-get update
+RUN apt-get install -y subversion
+
+RUN mkdir -p ${var_dir}
+RUN svn co --depth immediates http://svn.apache.org/repos/asf/httpcomponents/site ${www_dir}
+RUN svn up --set-depth infinity ${www_dir}/images
+RUN svn up --set-depth infinity ${www_dir}/css
+
+COPY httpd.conf /usr/local/apache2/conf/httpd.conf

Added: httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/httpd.conf
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/httpd.conf?rev=1774761&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/httpd.conf
(added)
+++ httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/apache-httpd/httpd.conf
Sat Dec 17 14:15:14 2016
@@ -0,0 +1,569 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+# ==========================================================================
+# This is the main Apache HTTP server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
+# In particular, see 
+# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "logs/access_log"
+# with ServerRoot set to "/usr/local/apache2" will be interpreted by the
+# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" 
+# will be interpreted as '/logs/access_log'.
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# Do not add a slash at the end of the directory path.  If you point
+# ServerRoot at a non-local disk, be sure to specify a local disk on the
+# Mutex directive, if file-based mutexes are used.  If you wish to share the
+# same ServerRoot for multiple httpd daemons, you will need to change at
+# least PidFile.
+#
+ServerRoot "/usr/local/apache2"
+
+#
+# Mutex: Allows you to set the mutex mechanism and mutex file directory
+# for individual mutexes, or change the global defaults
+#
+# Uncomment and change the directory if mutexes are file-based and the default
+# mutex file directory is not on a local disk or is not appropriate for some
+# other reason.
+#
+# Mutex default:logs
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, instead of the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses.
+#
+#Listen 12.34.56.78:80
+Listen 8080
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+LoadModule authn_file_module modules/mod_authn_file.so
+#LoadModule authn_dbm_module modules/mod_authn_dbm.so
+#LoadModule authn_anon_module modules/mod_authn_anon.so
+#LoadModule authn_dbd_module modules/mod_authn_dbd.so
+#LoadModule authn_socache_module modules/mod_authn_socache.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+LoadModule authz_user_module modules/mod_authz_user.so
+#LoadModule authz_dbm_module modules/mod_authz_dbm.so
+#LoadModule authz_owner_module modules/mod_authz_owner.so
+#LoadModule authz_dbd_module modules/mod_authz_dbd.so
+LoadModule authz_core_module modules/mod_authz_core.so
+#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
+#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+#LoadModule auth_form_module modules/mod_auth_form.so
+#LoadModule auth_digest_module modules/mod_auth_digest.so
+#LoadModule allowmethods_module modules/mod_allowmethods.so
+#LoadModule isapi_module modules/mod_isapi.so
+#LoadModule file_cache_module modules/mod_file_cache.so
+#LoadModule cache_module modules/mod_cache.so
+#LoadModule cache_disk_module modules/mod_cache_disk.so
+#LoadModule cache_socache_module modules/mod_cache_socache.so
+#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+#LoadModule socache_dbm_module modules/mod_socache_dbm.so
+#LoadModule socache_memcache_module modules/mod_socache_memcache.so
+#LoadModule watchdog_module modules/mod_watchdog.so
+#LoadModule macro_module modules/mod_macro.so
+#LoadModule dbd_module modules/mod_dbd.so
+#LoadModule bucketeer_module modules/mod_bucketeer.so
+#LoadModule dumpio_module modules/mod_dumpio.so
+#LoadModule echo_module modules/mod_echo.so
+#LoadModule example_hooks_module modules/mod_example_hooks.so
+#LoadModule case_filter_module modules/mod_case_filter.so
+#LoadModule case_filter_in_module modules/mod_case_filter_in.so
+#LoadModule example_ipc_module modules/mod_example_ipc.so
+#LoadModule buffer_module modules/mod_buffer.so
+#LoadModule data_module modules/mod_data.so
+#LoadModule ratelimit_module modules/mod_ratelimit.so
+LoadModule reqtimeout_module modules/mod_reqtimeout.so
+#LoadModule ext_filter_module modules/mod_ext_filter.so
+#LoadModule request_module modules/mod_request.so
+#LoadModule include_module modules/mod_include.so
+LoadModule filter_module modules/mod_filter.so
+#LoadModule reflector_module modules/mod_reflector.so
+#LoadModule substitute_module modules/mod_substitute.so
+#LoadModule sed_module modules/mod_sed.so
+#LoadModule charset_lite_module modules/mod_charset_lite.so
+#LoadModule deflate_module modules/mod_deflate.so
+#LoadModule xml2enc_module modules/mod_xml2enc.so
+#LoadModule proxy_html_module modules/mod_proxy_html.so
+LoadModule mime_module modules/mod_mime.so
+#LoadModule ldap_module modules/mod_ldap.so
+LoadModule log_config_module modules/mod_log_config.so
+#LoadModule log_debug_module modules/mod_log_debug.so
+#LoadModule log_forensic_module modules/mod_log_forensic.so
+#LoadModule logio_module modules/mod_logio.so
+#LoadModule lua_module modules/mod_lua.so
+LoadModule env_module modules/mod_env.so
+#LoadModule mime_magic_module modules/mod_mime_magic.so
+#LoadModule cern_meta_module modules/mod_cern_meta.so
+#LoadModule expires_module modules/mod_expires.so
+LoadModule headers_module modules/mod_headers.so
+#LoadModule ident_module modules/mod_ident.so
+#LoadModule usertrack_module modules/mod_usertrack.so
+#LoadModule unique_id_module modules/mod_unique_id.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+#LoadModule remoteip_module modules/mod_remoteip.so
+#LoadModule proxy_module modules/mod_proxy.so
+#LoadModule proxy_connect_module modules/mod_proxy_connect.so
+#LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
+#LoadModule proxy_http_module modules/mod_proxy_http.so
+#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
+#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so
+#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so
+#LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
+#LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
+#LoadModule proxy_express_module modules/mod_proxy_express.so
+#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so
+#LoadModule session_module modules/mod_session.so
+#LoadModule session_cookie_module modules/mod_session_cookie.so
+#LoadModule session_crypto_module modules/mod_session_crypto.so
+#LoadModule session_dbd_module modules/mod_session_dbd.so
+#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
+#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so
+#LoadModule ssl_module modules/mod_ssl.so
+#LoadModule optional_hook_export_module modules/mod_optional_hook_export.so
+#LoadModule optional_hook_import_module modules/mod_optional_hook_import.so
+#LoadModule optional_fn_import_module modules/mod_optional_fn_import.so
+#LoadModule optional_fn_export_module modules/mod_optional_fn_export.so
+#LoadModule dialup_module modules/mod_dialup.so
+LoadModule http2_module modules/mod_http2.so
+#LoadModule proxy_http2_module modules/mod_proxy_http2.so
+#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so
+#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so
+#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so
+#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so
+LoadModule unixd_module modules/mod_unixd.so
+#LoadModule heartbeat_module modules/mod_heartbeat.so
+#LoadModule heartmonitor_module modules/mod_heartmonitor.so
+#LoadModule dav_module modules/mod_dav.so
+LoadModule status_module modules/mod_status.so
+LoadModule autoindex_module modules/mod_autoindex.so
+#LoadModule asis_module modules/mod_asis.so
+#LoadModule info_module modules/mod_info.so
+#LoadModule suexec_module modules/mod_suexec.so
+<IfModule !mpm_prefork_module>
+	#LoadModule cgid_module modules/mod_cgid.so
+</IfModule>
+<IfModule mpm_prefork_module>
+	#LoadModule cgi_module modules/mod_cgi.so
+</IfModule>
+#LoadModule dav_fs_module modules/mod_dav_fs.so
+#LoadModule dav_lock_module modules/mod_dav_lock.so
+#LoadModule vhost_alias_module modules/mod_vhost_alias.so
+#LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule dir_module modules/mod_dir.so
+#LoadModule imagemap_module modules/mod_imagemap.so
+#LoadModule actions_module modules/mod_actions.so
+#LoadModule speling_module modules/mod_speling.so
+#LoadModule userdir_module modules/mod_userdir.so
+LoadModule alias_module modules/mod_alias.so
+#LoadModule rewrite_module modules/mod_rewrite.so
+
+<IfModule unixd_module>
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.  
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+# It is usually good practice to create a dedicated user and group for
+# running httpd, as with most system services.
+#
+User daemon
+Group daemon
+
+</IfModule>
+
+# 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+ServerAdmin dev@hc.apache.org
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+#
+ServerName localhost:8080
+
+Protocols h2c http/1.1
+
+<IfModule http2_module>
+
+    LogLevel http2:info
+
+    H2Push on
+
+</IfModule>
+
+#
+# Deny access to the entirety of your server's filesystem. You must
+# explicitly permit access to web content directories in other 
+# <Directory> blocks below.
+#
+<Directory />
+    AllowOverride none
+    Require all denied
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+DocumentRoot "/var/httpd/www"
+<Directory "/var/httpd/www">
+    #
+    # Possible values for the Options directive are "None", "All",
+    # or any combination of:
+    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+    #
+    # Note that "MultiViews" must be named *explicitly* --- "Options All"
+    # doesn't give it to you.
+    #
+    # The Options directive is both complicated and important.  Please see
+    # http://httpd.apache.org/docs/2.4/mod/core.html#options
+    # for more information.
+    #
+    Options Indexes FollowSymLinks
+
+    #
+    # AllowOverride controls what directives may be placed in .htaccess files.
+    # It can be "All", "None", or any combination of the keywords:
+    #   AllowOverride FileInfo AuthConfig Limit
+    #
+    AllowOverride None
+
+    #
+    # Controls who can get stuff from this server.
+    #
+    Require all granted
+
+</Directory>
+
+<IfModule headers_module>
+    <Location /index.html>
+        Header add Link "</css/site.css>;rel=preload"
+        Header add Link "</css/maven-theme.css>;rel=preload"
+        Header add Link "</css/maven-base.css>;rel=preload"
+        Header add Link "</css/hc-maven.css>;rel=preload"
+        Header add Link "</images/logos/httpcomponents.png>;rel=preload"
+    </Location>
+</IfModule>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+<IfModule dir_module>
+    DirectoryIndex index.html
+</IfModule>
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<Files ".ht*">
+    Require all denied
+</Files>
+
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog /proc/self/fd/2
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+<IfModule log_config_module>
+    #
+    # The following directives define some format nicknames for use with
+    # a CustomLog directive (see below).
+    #
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+    <IfModule logio_module>
+      # You need to enable mod_logio.c to use %I and %O
+      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+    </IfModule>
+
+    #
+    # The location and format of the access logfile (Common Logfile Format).
+    # If you do not define any access logfiles within a <VirtualHost>
+    # container, they will be logged here.  Contrariwise, if you *do*
+    # define per-<VirtualHost> access logfiles, transactions will be
+    # logged therein and *not* in this file.
+    #
+    CustomLog /proc/self/fd/1 common
+
+    #
+    # If you prefer a logfile with access, agent, and referer information
+    # (Combined Logfile Format) you can use the following directive.
+    #
+    #CustomLog "logs/access_log" combined
+</IfModule>
+
+<IfModule alias_module>
+    #
+    # Redirect: Allows you to tell clients about documents that used to 
+    # exist in your server's namespace, but do not anymore. The client 
+    # will make a new request for the document at its new location.
+    # Example:
+    # Redirect permanent /foo http://www.example.com/bar
+
+    #
+    # Alias: Maps web paths into filesystem paths and is used to
+    # access content that does not live under the DocumentRoot.
+    # Example:
+    # Alias /webpath /full/filesystem/path
+    #
+    # If you include a trailing / on /webpath then the server will
+    # require it to be present in the URL.  You will also likely
+    # need to provide a <Directory> section to allow access to
+    # the filesystem path.
+
+    #
+    # ScriptAlias: This controls which directories contain server scripts. 
+    # ScriptAliases are essentially the same as Aliases, except that
+    # documents in the target directory are treated as applications and
+    # run by the server when requested rather than as documents sent to the
+    # client.  The same rules about trailing "/" apply to ScriptAlias
+    # directives as to Alias.
+    #
+    ScriptAlias /cgi-bin/ "/usr/local/apache2/cgi-bin/"
+
+</IfModule>
+
+<IfModule cgid_module>
+    #
+    # ScriptSock: On threaded servers, designate the path to the UNIX
+    # socket used to communicate with the CGI daemon of mod_cgid.
+    #
+    #Scriptsock cgisock
+</IfModule>
+
+#
+# "/usr/local/apache2/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/usr/local/apache2/cgi-bin">
+    AllowOverride None
+    Options None
+    Require all granted
+</Directory>
+
+<IfModule mime_module>
+    #
+    # TypesConfig points to the file containing the list of mappings from
+    # filename extension to MIME-type.
+    #
+    TypesConfig conf/mime.types
+
+    #
+    # AddType allows you to add to or override the MIME configuration
+    # file specified in TypesConfig for specific file types.
+    #
+    #AddType application/x-gzip .tgz
+    #
+    # AddEncoding allows you to have certain browsers uncompress
+    # information on the fly. Note: Not all browsers support this.
+    #
+    #AddEncoding x-compress .Z
+    #AddEncoding x-gzip .gz .tgz
+    #
+    # If the AddEncoding directives above are commented-out, then you
+    # probably should define those extensions to indicate media types:
+    #
+    AddType application/x-compress .Z
+    AddType application/x-gzip .gz .tgz
+
+    #
+    # AddHandler allows you to map certain file extensions to "handlers":
+    # actions unrelated to filetype. These can be either built into the server
+    # or added with the Action directive (see below)
+    #
+    # To use CGI scripts outside of ScriptAliased directories:
+    # (You will also need to add "ExecCGI" to the "Options" directive.)
+    #
+    #AddHandler cgi-script .cgi
+
+    # For type maps (negotiated resources):
+    #AddHandler type-map var
+
+    #
+    # Filters allow you to process content before it is sent to the client.
+    #
+    # To parse .shtml files for server-side includes (SSI):
+    # (You will also need to add "Includes" to the "Options" directive.)
+    #
+    #AddType text/html .shtml
+    #AddOutputFilter INCLUDES .shtml
+</IfModule>
+
+#
+# The mod_mime_magic module allows the server to use various hints from the
+# contents of the file itself to determine its type.  The MIMEMagicFile
+# directive tells the module where the hint definitions are located.
+#
+#MIMEMagicFile conf/magic
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# MaxRanges: Maximum number of Ranges in a request before
+# returning the entire resource, or one of the special
+# values 'default', 'none' or 'unlimited'.
+# Default setting is to accept 200 Ranges.
+#MaxRanges unlimited
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it, 
+# memory-mapping or the sendfile syscall may be used to deliver
+# files.  This usually improves server performance, but must
+# be turned off when serving from networked-mounted 
+# filesystems or if support for these functions is otherwise
+# broken on your system.
+# Defaults: EnableMMAP On, EnableSendfile Off
+#
+#EnableMMAP off
+#EnableSendfile on
+
+# Supplemental configuration
+#
+# The configuration files in the conf/extra/ directory can be 
+# included to add extra features or to modify the default configuration of 
+# the server, or you may simply copy their contents here and change as 
+# necessary.
+
+# Server-pool management (MPM specific)
+#Include conf/extra/httpd-mpm.conf
+
+# Multi-language error messages
+#Include conf/extra/httpd-multilang-errordoc.conf
+
+# Fancy directory listings
+#Include conf/extra/httpd-autoindex.conf
+
+# Language settings
+#Include conf/extra/httpd-languages.conf
+
+# User home directories
+#Include conf/extra/httpd-userdir.conf
+
+# Real-time info on requests and configuration
+#Include conf/extra/httpd-info.conf
+
+# Virtual hosts
+#Include conf/extra/httpd-vhosts.conf
+
+# Local access to the Apache HTTP Server Manual
+#Include conf/extra/httpd-manual.conf
+
+# Distributed authoring and versioning (WebDAV)
+#Include conf/extra/httpd-dav.conf
+
+# Various default settings
+#Include conf/extra/httpd-default.conf
+
+# Configure mod_proxy_html to understand HTML4/XHTML1
+<IfModule proxy_html_module>
+Include conf/extra/proxy-html.conf
+</IfModule>
+
+# Secure (SSL/TLS) connections
+#Include conf/extra/httpd-ssl.conf
+#
+# Note: The following must must be present to support
+#       starting without SSL on platforms with no /dev/random equivalent
+#       but a statically compiled-in mod_ssl.
+#
+<IfModule ssl_module>
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+</IfModule>
+

Added: httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/.dockerignore
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/.dockerignore?rev=1774761&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/.dockerignore (added)
+++ httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/.dockerignore Sat
Dec 17 14:15:14 2016
@@ -0,0 +1 @@
+*/*/.svn

Added: httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/Dockerfile
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/Dockerfile?rev=1774761&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/Dockerfile (added)
+++ httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/Dockerfile Sat Dec
17 14:15:14 2016
@@ -0,0 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
+FROM nginx:1.11
+MAINTAINER dev@hc.apache.org
+
+ENV var_dir /var/nginx
+ENV www_dir ${var_dir}/www
+
+RUN apt-get update
+RUN apt-get install -y subversion
+
+RUN mkdir -p ${var_dir}
+RUN svn co --depth immediates http://svn.apache.org/repos/asf/httpcomponents/site ${www_dir}
+RUN svn up --set-depth infinity ${www_dir}/images
+RUN svn up --set-depth infinity ${www_dir}/css
+
+COPY default.conf /etc/nginx/conf.d/default.conf

Added: httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/default.conf
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/default.conf?rev=1774761&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/default.conf (added)
+++ httpcomponents/httpcore/trunk/httpcore5-testing-compat/docker/nginx/default.conf Sat Dec
17 14:15:14 2016
@@ -0,0 +1,39 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
+server {
+    listen       8081 http2;
+    server_name  localhost;
+
+    location / {
+        root   /var/nginx/www;
+        index  index.html;
+
+        location = /index.html {
+            add_header Link "</css/site.css>;rel=preload";
+            add_header Link "</css/maven-theme.css>;rel=preload";
+            add_header Link "</css/maven-base.css>;rel=preload";
+            add_header Link "</css/hc-maven.css>;rel=preload";
+            add_header Link "</images/logos/httpcomponents.png>;rel=preload";
+        }
+    }
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+}
+

Added: httpcomponents/httpcore/trunk/httpcore5-testing-compat/src/test/java/org/apache/hc/core5/compatibility/http2/Http2CompatibilityTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing-compat/src/test/java/org/apache/hc/core5/compatibility/http2/Http2CompatibilityTest.java?rev=1774761&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing-compat/src/test/java/org/apache/hc/core5/compatibility/http2/Http2CompatibilityTest.java
(added)
+++ httpcomponents/httpcore/trunk/httpcore5-testing-compat/src/test/java/org/apache/hc/core5/compatibility/http2/Http2CompatibilityTest.java
Sat Dec 17 14:15:14 2016
@@ -0,0 +1,240 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+package org.apache.hc.core5.compatibility.http2;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.hc.core5.concurrent.FutureCallback;
+import org.apache.hc.core5.function.Supplier;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.Message;
+import org.apache.hc.core5.http.impl.nio.bootstrap.ClientEndpoint;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.nio.AsyncPushConsumer;
+import org.apache.hc.core5.http.nio.BasicRequestProducer;
+import org.apache.hc.core5.http.nio.BasicResponseConsumer;
+import org.apache.hc.core5.http.nio.entity.NoopEntityConsumer;
+import org.apache.hc.core5.http.nio.entity.StringAsyncEntityConsumer;
+import org.apache.hc.core5.http.nio.support.BasicAsyncPushHandler;
+import org.apache.hc.core5.http2.config.H2Config;
+import org.apache.hc.core5.reactor.IOReactorConfig;
+import org.apache.hc.core5.testing.nio.http2.Http2TestClient;
+
+public class Http2CompatibilityTest {
+
+    enum ServerType { DEFAULT, APACHE_HTTPD, NGINX }
+
+    private final HttpHost target;
+    private final H2Config h2Config;
+    private final Http2TestClient client;
+
+    public static void main(final String... args) throws Exception {
+
+        final HttpHost target = args.length > 0 ? HttpHost.create(args[0]) : new HttpHost("localhost",
8080);
+        final ServerType serverType = args.length > 1 ? ServerType.valueOf(args[1].toUpperCase(Locale.ROOT))
: ServerType.DEFAULT;
+
+        final H2Config h2Config;
+        switch (serverType) {
+            case APACHE_HTTPD:
+                h2Config = H2Config.custom()
+                        .setPushEnabled(true)
+                        // Required for compatibility with Apache HTTPD 2.4
+                        .setSettingAckNeeded(false)
+                        .build();
+                break;
+            case NGINX:
+                h2Config = H2Config.custom()
+                        .setPushEnabled(true)
+                        .build();
+                break;
+             default:
+                 h2Config = H2Config.DEFAULT;
+        }
+
+        final Http2CompatibilityTest test = new Http2CompatibilityTest(target, h2Config);
+        try {
+            test.start();
+            test.execute();
+        } finally {
+            test.shutdown();
+        }
+    }
+
+    Http2CompatibilityTest(final HttpHost target, final H2Config h2Config) throws Exception
{
+        this.target = target;
+        this.h2Config = h2Config;
+        this.client = new Http2TestClient(IOReactorConfig.DEFAULT, null);
+    }
+
+    void start() throws Exception {
+        client.start(h2Config);
+    }
+
+    void shutdown() throws Exception {
+        client.shutdown(5, TimeUnit.SECONDS);
+    }
+
+    private final static String[] REQUEST_URIS = new String[] {"/", "/news.html", "/status.html"};
+
+    void execute() throws Exception {
+        final Future<ClientEndpoint> connectFuture = client.connect(target, 5, TimeUnit.SECONDS);
+        final ClientEndpoint clientEndpoint = connectFuture.get(5, TimeUnit.SECONDS);
+
+        final BlockingDeque<RequestResult> resultQueue = new LinkedBlockingDeque<>();
+
+        if (h2Config.isPushEnabled()) {
+            client.register("*", new Supplier<AsyncPushConsumer>() {
+
+                @Override
+                public AsyncPushConsumer get() {
+                    return new BasicAsyncPushHandler<Void>(new BasicResponseConsumer<>(new
NoopEntityConsumer())) {
+
+                        @Override
+                        protected void handleResponse(
+                                final HttpRequest promise,
+                                final Message<HttpResponse, Void> responseMessage)
throws IOException, HttpException {
+                            resultQueue.add(new RequestResult(promise, responseMessage.getHead(),
null));
+                        }
+
+                        @Override
+                        protected void handleError(
+                                final HttpRequest promise,
+                                final Exception cause) {
+                            resultQueue.add(new RequestResult(promise, null, cause));
+                        }
+                    };
+                }
+
+            });
+        }
+        for (final String requestUri: REQUEST_URIS) {
+            final HttpRequest request = new BasicHttpRequest("GET", target, requestUri);
+            clientEndpoint.execute(
+                    new BasicRequestProducer(request, null),
+                    new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
+                    new FutureCallback<Message<HttpResponse, String>>() {
+
+                        @Override
+                        public void completed(final Message<HttpResponse, String> responseMessage)
{
+                            resultQueue.add(new RequestResult(request, responseMessage.getHead(),
null));
+                        }
+
+                        @Override
+                        public void failed(final Exception ex) {
+                            resultQueue.add(new RequestResult(request, null, ex));
+                        }
+
+                        @Override
+                        public void cancelled() {
+                            resultQueue.add(new RequestResult(request, null, new CancellationException()));
+                        }
+
+                    });
+        }
+
+        String serverInfo = null;
+        final Map<String, RequestResult> resultMap = new HashMap<>();
+        for (;;) {
+            final RequestResult entry = resultQueue.poll(3, TimeUnit.SECONDS);
+            if (entry != null) {
+                final HttpRequest request = entry.request;
+                final HttpResponse response = entry.response;
+                if (response != null) {
+                    final Header header = response.getFirstHeader(HttpHeaders.SERVER);
+                    if (header != null) {
+                        serverInfo = header.getValue();
+                    }
+                }
+                resultMap.put(request.getRequestUri(), entry);
+            } else {
+                break;
+            }
+        }
+        clientEndpoint.close();
+
+        System.out.println("Server info: " + serverInfo);
+        for (final String requestUri: REQUEST_URIS) {
+            final RequestResult entry = resultMap.remove(requestUri);
+            if (entry != null) {
+                final HttpResponse response = entry.response;
+                final Exception exception = entry.exception;
+                if (exception != null) {
+                    System.out.println("NOK: " + requestUri + " -> " + exception.getMessage());
+                } if (response != null) {
+                    System.out.println((response.getCode() == HttpStatus.SC_OK ? "OK: " :
"NOK: ") +
+                            requestUri + " -> " + response.getCode());
+                }
+            }
+        }
+        if (h2Config.isPushEnabled() && resultMap.isEmpty()) {
+            System.out.println("NOK: pushed responses expected");
+        }
+
+        for (final Iterator<RequestResult> it = resultMap.values().iterator(); it.hasNext();
) {
+            final RequestResult entry = it.next();
+            final HttpRequest request = entry.request;
+            final HttpResponse response = entry.response;
+            final Exception exception = entry.exception;
+            if (exception != null) {
+                System.out.println("NOK: " + request.getRequestUri() + " (pushed) -> "
+ exception.getMessage());
+            } if (response != null) {
+                System.out.println((response.getCode() == HttpStatus.SC_OK ? "OK: " : "NOK:
") +
+                        request.getRequestUri() + " (pushed) -> " + response.getCode());
+            }
+        }
+    }
+
+    static class RequestResult {
+
+        final HttpRequest request;
+        final HttpResponse response;
+        final Exception exception;
+
+        RequestResult(final HttpRequest request, final HttpResponse response, final Exception
exception) {
+            this.request = request;
+            this.response = response;
+            this.exception = exception;
+        }
+
+    }
+
+}

Propchange: httpcomponents/httpcore/trunk/httpcore5-testing-compat/src/test/java/org/apache/hc/core5/compatibility/http2/Http2CompatibilityTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore5-testing-compat/src/test/java/org/apache/hc/core5/compatibility/http2/Http2CompatibilityTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpcore/trunk/httpcore5-testing-compat/src/test/java/org/apache/hc/core5/compatibility/http2/Http2CompatibilityTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: httpcomponents/httpcore/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/pom.xml?rev=1774761&r1=1774760&r2=1774761&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/pom.xml (original)
+++ httpcomponents/httpcore/trunk/pom.xml Sat Dec 17 14:15:14 2016
@@ -325,6 +325,7 @@
             <exclude>maven-eclipse.xml</exclude>
             <exclude>src/docbkx/resources/**</exclude>
             <exclude>src/test/resources/*.truststore</exclude>
+            <exclude>**/.dockerignore</exclude>
           </excludes>
         </configuration>
       </plugin>



Mime
View raw message