You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2019/09/27 09:26:13 UTC
[httpcomponents-core] branch development updated (b080fe8 ->
d8fe6be)
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a change to branch development
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git.
discard b080fe8 Improved external compatibility tests
discard b6298dc Updated docker images
discard bb73e3d Text based entity and data consumers to use CharCodingConfig constructor parameter
omit 4ac49aa Simplification of HTTP/1.1 read event handling logic; better fix for HTTPCORE-599
omit 6f498f7 Redesign of SSL/TLS async I/O event handling
omit d918b56 Added mechanism for low level i/o event handlers to push input data up the protocol processing chain instead of expecting the protocol handlers to consume it from the i/o session buffers
add 44c3aa3 HTTPCLIENT-2016, regression: Tab chars are replaced by question marks in header values
add 043de30 Added mechanism for low level i/o event handlers to push input data up the protocol processing chain instead of expecting the protocol handlers to consume it from the i/o session buffers
add 8273dcb Redesign of SSL/TLS async I/O event handling
add dac5470 Simplification of HTTP/1.1 read event handling logic; better fix for HTTPCORE-599
new 5e1940b Text based entity and data consumers to use CharCodingConfig constructor parameter
new f0ab105 Updated docker images
new d8fe6be Improved external compatibility tests
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b080fe8)
\
N -- N -- N refs/heads/development (d8fe6be)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/hc/core5/util/ByteArrayBuffer.java | 8 +++++---
.../test/java/org/apache/hc/core5/util/TestByteArrayBuffer.java | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
[httpcomponents-core] 02/03: Updated docker images
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch development
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit f0ab105e7d86e9fe2629d6821747a19da92a1719
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Tue Aug 27 11:23:55 2019 +0200
Updated docker images
---
httpcore5-testing/docker/BUILDING.txt | 8 +-
httpcore5-testing/docker/apache-httpd/Dockerfile | 6 +-
.../httpd-vhosts.conf} | 43 +-
httpcore5-testing/docker/apache-httpd/httpd.conf | 569 ---------------------
.../.dockerignore => httpbin/Dockerfile} | 3 +-
httpcore5-testing/docker/nginx/.dockerignore | 16 -
httpcore5-testing/docker/nginx/Dockerfile | 2 +-
httpcore5-testing/docker/nginx/default.conf | 3 +-
.../compatibility/http2/H2CompatibilityTest.java | 7 +
9 files changed, 48 insertions(+), 609 deletions(-)
diff --git a/httpcore5-testing/docker/BUILDING.txt b/httpcore5-testing/docker/BUILDING.txt
index 10c5004..f687ec3 100644
--- a/httpcore5-testing/docker/BUILDING.txt
+++ b/httpcore5-testing/docker/BUILDING.txt
@@ -9,11 +9,15 @@ 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
+sudo docker run --name my-hc-tests-httpd -p 0.0.0.0:8080:80 -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
+sudo docker run --name my-hc-tests-nginx -p 0.0.0.0:8081:80 -d hc-tests-nginx:latest
+
+cd docker/httpbin
+sudo docker build -t hc-tests-httpbin .
+sudo docker run --name my-hc-tests-httpbin -p 0.0.0.0:8082:80 -d hc-tests-httpbin:latest
---
Execute
diff --git a/httpcore5-testing/docker/apache-httpd/Dockerfile b/httpcore5-testing/docker/apache-httpd/Dockerfile
index 3520ee2..ac1d2cb 100644
--- a/httpcore5-testing/docker/apache-httpd/Dockerfile
+++ b/httpcore5-testing/docker/apache-httpd/Dockerfile
@@ -27,4 +27,8 @@ RUN svn co --depth immediates http://svn.apache.org/repos/asf/httpcomponents/sit
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
+RUN sed -i -E 's/^\s*#\s*(LoadModule\s+http2_module\s+modules\/mod_http2.so)/\1/' conf/httpd.conf
+
+RUN sed -i -E 's/^\s*ServerAdmin.*$/ServerAdmin dev@hc.apache.org/' conf/httpd.conf
+RUN sed -i -E 's/^\s*#\s*(Include\s+conf\/extra\/httpd-vhosts.conf)/\1/' conf/httpd.conf
+COPY httpd-vhosts.conf /usr/local/apache2/conf/extra/httpd-vhosts.conf
\ No newline at end of file
diff --git a/httpcore5-testing/docker/nginx/default.conf b/httpcore5-testing/docker/apache-httpd/httpd-vhosts.conf
similarity index 51%
copy from httpcore5-testing/docker/nginx/default.conf
copy to httpcore5-testing/docker/apache-httpd/httpd-vhosts.conf
index 5bcb541..160c1cc 100644
--- a/httpcore5-testing/docker/nginx/default.conf
+++ b/httpcore5-testing/docker/apache-httpd/httpd-vhosts.conf
@@ -13,26 +13,33 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-server {
- listen 8081 http2;
- server_name localhost;
+ServerName localhost:80
- location / {
- root /var/nginx/www;
- index index.html;
+Protocols h2c http/1.1
- location = /index.html {
- http2_push "/css/site.css";
- http2_push "/css/maven-theme.css";
- http2_push "/css/hc-maven.css";
- http2_push "/images/logos/httpcomponents.png";
- }
- }
+<IfModule http2_module>
+ LogLevel http2:info
+ H2Push on
+</IfModule>
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /usr/share/nginx/html;
- }
+<Directory />
+ AllowOverride none
+ Require all denied
+</Directory>
-}
+DocumentRoot "/var/httpd/www"
+<Directory "/var/httpd/www">
+ Options Indexes FollowSymLinks
+ AllowOverride None
+ 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>
diff --git a/httpcore5-testing/docker/apache-httpd/httpd.conf b/httpcore5-testing/docker/apache-httpd/httpd.conf
deleted file mode 100644
index c5e9ba6..0000000
--- a/httpcore5-testing/docker/apache-httpd/httpd.conf
+++ /dev/null
@@ -1,569 +0,0 @@
-# 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>
-
diff --git a/httpcore5-testing/docker/apache-httpd/.dockerignore b/httpcore5-testing/docker/httpbin/Dockerfile
similarity index 92%
rename from httpcore5-testing/docker/apache-httpd/.dockerignore
rename to httpcore5-testing/docker/httpbin/Dockerfile
index 2b0b58d..e4120c3 100644
--- a/httpcore5-testing/docker/apache-httpd/.dockerignore
+++ b/httpcore5-testing/docker/httpbin/Dockerfile
@@ -13,4 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-*/*/.svn
+FROM kennethreitz/httpbin:latest
+MAINTAINER dev@hc.apache.org
diff --git a/httpcore5-testing/docker/nginx/.dockerignore b/httpcore5-testing/docker/nginx/.dockerignore
deleted file mode 100644
index 2b0b58d..0000000
--- a/httpcore5-testing/docker/nginx/.dockerignore
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-
-*/*/.svn
diff --git a/httpcore5-testing/docker/nginx/Dockerfile b/httpcore5-testing/docker/nginx/Dockerfile
index 25645b4..a94e762 100644
--- a/httpcore5-testing/docker/nginx/Dockerfile
+++ b/httpcore5-testing/docker/nginx/Dockerfile
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM nginx:1.15
+FROM nginx:1.17
MAINTAINER dev@hc.apache.org
ENV var_dir /var/nginx
diff --git a/httpcore5-testing/docker/nginx/default.conf b/httpcore5-testing/docker/nginx/default.conf
index 5bcb541..b6160d6 100644
--- a/httpcore5-testing/docker/nginx/default.conf
+++ b/httpcore5-testing/docker/nginx/default.conf
@@ -14,7 +14,7 @@
# limitations under the License.
server {
- listen 8081 http2;
+ listen 80 http2;
server_name localhost;
location / {
@@ -24,6 +24,7 @@ server {
location = /index.html {
http2_push "/css/site.css";
http2_push "/css/maven-theme.css";
+ http2_push "/css/maven-base.css";
http2_push "/css/hc-maven.css";
http2_push "/images/logos/httpcomponents.png";
}
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/http2/H2CompatibilityTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/http2/H2CompatibilityTest.java
index 3060a1e..ec86364 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/http2/H2CompatibilityTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/http2/H2CompatibilityTest.java
@@ -94,7 +94,14 @@ public class H2CompatibilityTest {
final H2CompatibilityTest test = new H2CompatibilityTest(target, h2Config);
try {
test.start();
+<<<<<<< Updated upstream
test.execute();
+=======
+ for (final HttpHost h2server : h2servers) {
+ test.executeH2(h2server);
+ }
+ test.executeHttpBin(httpbin);
+>>>>>>> Stashed changes
} finally {
test.shutdown();
}
[httpcomponents-core] 01/03: Text based entity and data consumers
to use CharCodingConfig constructor parameter
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch development
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit 5e1940be44a718abe6909d8c25f7bd3093cfe1ce
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Thu Sep 26 14:50:03 2019 +0200
Text based entity and data consumers to use CharCodingConfig constructor parameter
---
.../entity/AbstractCharAsyncEntityConsumer.java | 16 ++++++-----
.../http/nio/entity/AbstractCharDataConsumer.java | 33 +++++++++++++++++++---
.../http/nio/entity/StringAsyncEntityConsumer.java | 15 ++++++++--
3 files changed, 50 insertions(+), 14 deletions(-)
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharAsyncEntityConsumer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharAsyncEntityConsumer.java
index df452bc..34bf15c 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharAsyncEntityConsumer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharAsyncEntityConsumer.java
@@ -28,14 +28,13 @@ package org.apache.hc.core5.http.nio.entity;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
import java.nio.charset.UnsupportedCharsetException;
import org.apache.hc.core5.concurrent.FutureCallback;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.EntityDetails;
import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.config.CharCodingConfig;
import org.apache.hc.core5.http.nio.AsyncEntityConsumer;
import org.apache.hc.core5.util.Args;
@@ -51,6 +50,13 @@ public abstract class AbstractCharAsyncEntityConsumer<T> extends AbstractCharDat
private volatile FutureCallback<T> resultCallback;
private volatile T content;
+ protected AbstractCharAsyncEntityConsumer(final int bufSize, final CharCodingConfig charCodingConfig) {
+ super(bufSize, charCodingConfig);
+ }
+
+ public AbstractCharAsyncEntityConsumer() {
+ }
+
/**
* Triggered to signal beginning of entity content stream.
*
@@ -73,11 +79,7 @@ public abstract class AbstractCharAsyncEntityConsumer<T> extends AbstractCharDat
this.resultCallback = resultCallback;
try {
final ContentType contentType = entityDetails != null ? ContentType.parse(entityDetails.getContentType()) : null;
- Charset charset = contentType != null ? contentType.getCharset() : null;
- if (charset == null) {
- charset = StandardCharsets.US_ASCII;
- }
- setCharset(charset);
+ setCharset(contentType != null ? contentType.getCharset() : null);
streamStart(contentType);
} catch (final UnsupportedCharsetException ex) {
throw new UnsupportedEncodingException(ex.getMessage());
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharDataConsumer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharDataConsumer.java
index 91c4cc4..d89a431 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharDataConsumer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharDataConsumer.java
@@ -37,8 +37,10 @@ import java.util.List;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.config.CharCodingConfig;
import org.apache.hc.core5.http.nio.AsyncDataConsumer;
import org.apache.hc.core5.http.nio.CapacityChannel;
+import org.apache.hc.core5.util.Args;
/**
* Abstract text data consumer.
@@ -47,13 +49,23 @@ import org.apache.hc.core5.http.nio.CapacityChannel;
*/
public abstract class AbstractCharDataConsumer implements AsyncDataConsumer {
+ protected static final int DEF_BUF_SIZE = 8192;
private static final ByteBuffer EMPTY_BIN = ByteBuffer.wrap(new byte[0]);
- private final CharBuffer charbuf = CharBuffer.allocate(8192);
+ private final CharBuffer charbuf;
+ private final CharCodingConfig charCodingConfig;
- private volatile Charset charset = StandardCharsets.US_ASCII;
+ private volatile Charset charset;
private volatile CharsetDecoder charsetDecoder;
+ protected AbstractCharDataConsumer(final int bufSize, final CharCodingConfig charCodingConfig) {
+ this.charbuf = CharBuffer.allocate(Args.positive(bufSize, "Buffer size"));
+ this.charCodingConfig = charCodingConfig != null ? charCodingConfig : CharCodingConfig.DEFAULT;
+ }
+
+ public AbstractCharDataConsumer() {
+ this(DEF_BUF_SIZE, CharCodingConfig.DEFAULT);
+ }
/**
* Triggered to obtain the capacity increment.
*
@@ -76,7 +88,7 @@ public abstract class AbstractCharDataConsumer implements AsyncDataConsumer {
protected abstract void completed() throws IOException;
protected final void setCharset(final Charset charset) {
- this.charset = charset != null ? charset : StandardCharsets.US_ASCII;
+ this.charset = charset != null ? charset : charCodingConfig.getCharset();
this.charsetDecoder = null;
}
@@ -99,7 +111,20 @@ public abstract class AbstractCharDataConsumer implements AsyncDataConsumer {
private CharsetDecoder getCharsetDecoder() {
if (charsetDecoder == null) {
- charsetDecoder = charset != null ? charset.newDecoder() : StandardCharsets.US_ASCII.newDecoder();
+ Charset charset = this.charset;
+ if (charset == null) {
+ charset = charCodingConfig.getCharset();
+ }
+ if (charset == null) {
+ charset = StandardCharsets.US_ASCII;
+ }
+ charsetDecoder = charset.newDecoder();
+ if (charCodingConfig.getMalformedInputAction() != null) {
+ charsetDecoder.onMalformedInput(charCodingConfig.getMalformedInputAction());
+ }
+ if (charCodingConfig.getUnmappableInputAction() != null) {
+ charsetDecoder.onUnmappableCharacter(charCodingConfig.getUnmappableInputAction());
+ }
}
return charsetDecoder;
}
diff --git a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/StringAsyncEntityConsumer.java b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/StringAsyncEntityConsumer.java
index e1019af..275fce5 100644
--- a/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/StringAsyncEntityConsumer.java
+++ b/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/StringAsyncEntityConsumer.java
@@ -31,6 +31,7 @@ import java.nio.CharBuffer;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.config.CharCodingConfig;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.CharArrayBuffer;
@@ -45,12 +46,20 @@ public class StringAsyncEntityConsumer extends AbstractCharAsyncEntityConsumer<S
private final int capacityIncrement;
private final CharArrayBuffer content;
- public StringAsyncEntityConsumer(final int capacityIncrement) {
- Args.positive(capacityIncrement, "Capacity increment");
- this.capacityIncrement = capacityIncrement;
+ public StringAsyncEntityConsumer(final int bufSize, final int capacityIncrement, final CharCodingConfig charCodingConfig) {
+ super(bufSize, charCodingConfig);
+ this.capacityIncrement = Args.positive(capacityIncrement, "Capacity increment");
this.content = new CharArrayBuffer(1024);
}
+ public StringAsyncEntityConsumer(final int capacityIncrement) {
+ this(DEF_BUF_SIZE, capacityIncrement, CharCodingConfig.DEFAULT);
+ }
+
+ public StringAsyncEntityConsumer(final CharCodingConfig charCodingConfig) {
+ this(DEF_BUF_SIZE, Integer.MAX_VALUE, charCodingConfig);
+ }
+
public StringAsyncEntityConsumer() {
this(Integer.MAX_VALUE);
}
[httpcomponents-core] 03/03: Improved external compatibility tests
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch development
in repository https://gitbox.apache.org/repos/asf/httpcomponents-core.git
commit d8fe6be67abb6bd794d0ce6031fe89aec75e0b3d
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Sat Aug 31 11:36:07 2019 +0200
Improved external compatibility tests
---
.../compatibility/http2/H2CompatibilityTest.java | 512 +++++++++++++++------
1 file changed, 359 insertions(+), 153 deletions(-)
diff --git a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/http2/H2CompatibilityTest.java b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/http2/H2CompatibilityTest.java
index ec86364..cd1b795 100644
--- a/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/http2/H2CompatibilityTest.java
+++ b/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/compatibility/http2/H2CompatibilityTest.java
@@ -27,222 +27,428 @@
package org.apache.hc.core5.testing.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.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
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.ContentType;
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.Methods;
+import org.apache.hc.core5.http.config.CharCodingConfig;
+import org.apache.hc.core5.http.impl.bootstrap.HttpAsyncRequester;
import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.nio.AsyncClientEndpoint;
+import org.apache.hc.core5.http.nio.AsyncEntityProducer;
import org.apache.hc.core5.http.nio.AsyncPushConsumer;
+import org.apache.hc.core5.http.nio.HandlerFactory;
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.entity.StringAsyncEntityProducer;
import org.apache.hc.core5.http.nio.support.AbstractAsyncPushHandler;
import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
import org.apache.hc.core5.http.nio.support.BasicResponseConsumer;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http2.HttpVersionPolicy;
import org.apache.hc.core5.http2.config.H2Config;
+import org.apache.hc.core5.http2.impl.nio.bootstrap.H2RequesterBootstrap;
+import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.reactor.IOReactorConfig;
-import org.apache.hc.core5.testing.nio.ClientSessionEndpoint;
-import org.apache.hc.core5.testing.nio.H2TestClient;
-import org.apache.hc.core5.util.TimeValue;
+import org.apache.hc.core5.testing.classic.LoggingConnPoolListener;
+import org.apache.hc.core5.testing.nio.LoggingExceptionCallback;
+import org.apache.hc.core5.testing.nio.LoggingH2StreamListener;
+import org.apache.hc.core5.testing.nio.LoggingHttp1StreamListener;
+import org.apache.hc.core5.testing.nio.LoggingIOSessionDecorator;
+import org.apache.hc.core5.testing.nio.LoggingIOSessionListener;
+import org.apache.hc.core5.util.TextUtils;
import org.apache.hc.core5.util.Timeout;
public class H2CompatibilityTest {
- enum ServerType { DEFAULT, APACHE_HTTPD, NGINX }
-
- private final HttpHost target;
- private final H2Config h2Config;
- private final H2TestClient client;
+ private final HttpAsyncRequester 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 HttpHost[] h2servers = new HttpHost[]{
+ new HttpHost("http", "localhost", 8080),
+ new HttpHost("http", "localhost", 8081)
+ };
- final H2Config h2Config;
- switch (serverType) {
- case APACHE_HTTPD:
- h2Config = H2Config.custom()
- .setPushEnabled(true)
- .build();
- break;
- case NGINX:
- h2Config = H2Config.custom()
- .setPushEnabled(true)
- .build();
- break;
- default:
- h2Config = H2Config.DEFAULT;
- }
+ final HttpHost httpbin = new HttpHost("http", "localhost", 8082);
- final H2CompatibilityTest test = new H2CompatibilityTest(target, h2Config);
+ final H2CompatibilityTest test = new H2CompatibilityTest();
try {
test.start();
-<<<<<<< Updated upstream
- test.execute();
-=======
for (final HttpHost h2server : h2servers) {
test.executeH2(h2server);
}
test.executeHttpBin(httpbin);
->>>>>>> Stashed changes
} finally {
test.shutdown();
}
}
- H2CompatibilityTest(final HttpHost target, final H2Config h2Config) throws Exception {
- this.target = target;
- this.h2Config = h2Config;
- this.client = new H2TestClient(IOReactorConfig.DEFAULT, null);
+ H2CompatibilityTest() throws Exception {
+ this.client = H2RequesterBootstrap.bootstrap()
+ .setIOReactorConfig(IOReactorConfig.custom()
+ .setSoTimeout(TIMEOUT)
+ .build())
+ .setH2Config(H2Config.custom()
+ .setPushEnabled(true)
+ .build())
+ .setStreamListener(LoggingHttp1StreamListener.INSTANCE_CLIENT)
+ .setStreamListener(LoggingH2StreamListener.INSTANCE)
+ .setConnPoolListener(LoggingConnPoolListener.INSTANCE)
+ .setIOSessionDecorator(LoggingIOSessionDecorator.INSTANCE)
+ .setExceptionCallback(LoggingExceptionCallback.INSTANCE)
+ .setIOSessionListener(LoggingIOSessionListener.INSTANCE)
+ .create();
}
void start() throws Exception {
- client.start(h2Config);
+ client.start();
}
void shutdown() throws Exception {
- client.shutdown(TimeValue.ofSeconds(5));
+ client.close(CloseMode.GRACEFUL);
}
- private final static String[] REQUEST_URIS = new String[] {"/", "/news.html", "/status.html"};
-
- void execute() throws Exception {
- final Future<ClientSessionEndpoint> connectFuture = client.connect(target, Timeout.ofSeconds(5));
- final ClientSessionEndpoint 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 AbstractAsyncPushHandler<Message<HttpResponse, 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));
- }
- };
+ private static final Timeout TIMEOUT = Timeout.ofSeconds(5);
+
+ void executeH2(final HttpHost target) throws Exception {
+ {
+ System.out.println("*** HTTP/2 simple request execution ***");
+ final Future<AsyncClientEndpoint> connectFuture = client.connect(target, TIMEOUT, HttpVersionPolicy.FORCE_HTTP_2, null);
+ try {
+ final AsyncClientEndpoint endpoint = connectFuture.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
+
+ final CountDownLatch countDownLatch = new CountDownLatch(1);
+ final HttpRequest httpget = new BasicHttpRequest(Methods.GET, target, "/status.html");
+ endpoint.execute(
+ new BasicRequestProducer(httpget, null),
+ new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
+ new FutureCallback<Message<HttpResponse, String>>() {
+
+ @Override
+ public void completed(final Message<HttpResponse, String> responseMessage) {
+ final HttpResponse response = responseMessage.getHead();
+ final int code = response.getCode();
+ if (code == HttpStatus.SC_OK) {
+ logResult(TestResult.OK, target, httpget, response,
+ Objects.toString(response.getFirstHeader("server")));
+ } else {
+ logResult(TestResult.NOK, target, httpget, response, "(status " + code + ")");
+ }
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void failed(final Exception ex) {
+ logResult(TestResult.NOK, target, httpget, null, "(" + ex.getMessage() + ")");
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void cancelled() {
+ logResult(TestResult.NOK, target, httpget, null, "(cancelled)");
+ countDownLatch.countDown();
+ }
+
+ });
+ if (!countDownLatch.await(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit())) {
+ logResult(TestResult.NOK, target, null, null, "(single request execution failed to complete in time)");
}
-
- });
+ } catch (final ExecutionException ex) {
+ final Throwable cause = ex.getCause();
+ logResult(TestResult.NOK, target, null, null, "(" + cause.getMessage() + ")");
+ } catch (final TimeoutException ex) {
+ logResult(TestResult.NOK, target, null, null, "(time out)");
+ }
}
- for (final String requestUri: REQUEST_URIS) {
- final HttpRequest request = new BasicHttpRequest(Methods.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()));
- }
-
- });
+ {
+ System.out.println("*** HTTP/2 multiplexed request execution ***");
+ final Future<AsyncClientEndpoint> connectFuture = client.connect(target, TIMEOUT, HttpVersionPolicy.FORCE_HTTP_2, null);
+ try {
+ final AsyncClientEndpoint endpoint = connectFuture.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
+
+ final int reqCount = 20;
+ final CountDownLatch countDownLatch = new CountDownLatch(reqCount);
+ for (int i = 0; i < reqCount; i++) {
+ final HttpRequest httpget = new BasicHttpRequest(Methods.GET, target, "/status.html");
+ endpoint.execute(
+ new BasicRequestProducer(httpget, null),
+ new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
+ new FutureCallback<Message<HttpResponse, String>>() {
+
+ @Override
+ public void completed(final Message<HttpResponse, String> responseMessage) {
+ final HttpResponse response = responseMessage.getHead();
+ final int code = response.getCode();
+ if (code == HttpStatus.SC_OK) {
+ logResult(TestResult.OK, target, httpget, response,
+ "multiplexed / " + response.getFirstHeader("server"));
+ } else {
+ logResult(TestResult.NOK, target, httpget, response, "(status " + code + ")");
+ }
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void failed(final Exception ex) {
+ logResult(TestResult.NOK, target, httpget, null, "(" + ex.getMessage() + ")");
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void cancelled() {
+ logResult(TestResult.NOK, target, httpget, null, "(cancelled)");
+ countDownLatch.countDown();
+ }
+
+ });
+ }
+ if (!countDownLatch.await(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit())) {
+ logResult(TestResult.NOK, target, null, null, "(multiplexed request execution failed to complete in time)");
+ }
+ } catch (final ExecutionException ex) {
+ final Throwable cause = ex.getCause();
+ logResult(TestResult.NOK, target, null, null, "(" + cause.getMessage() + ")");
+ } catch (final TimeoutException ex) {
+ logResult(TestResult.NOK, target, null, null, "(time out)");
+ }
}
-
- 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();
+ {
+ System.out.println("*** HTTP/2 request execution with push ***");
+ final Future<AsyncClientEndpoint> connectFuture = client.connect(target, TIMEOUT, HttpVersionPolicy.FORCE_HTTP_2, null);
+ try {
+ final AsyncClientEndpoint endpoint = connectFuture.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
+
+ final CountDownLatch countDownLatch = new CountDownLatch(5);
+ final HttpRequest httpget = new BasicHttpRequest(Methods.GET, target, "/index.html");
+ final Future<Message<HttpResponse, String>> future = endpoint.execute(
+ new BasicRequestProducer(httpget, null),
+ new BasicResponseConsumer<>(new StringAsyncEntityConsumer()),
+ new HandlerFactory<AsyncPushConsumer>() {
+
+ @Override
+ public AsyncPushConsumer create(
+ final HttpRequest request, final HttpContext context) throws HttpException {
+ return new AbstractAsyncPushHandler<Message<HttpResponse, Void>>(new BasicResponseConsumer<>(new NoopEntityConsumer())) {
+
+ @Override
+ protected void handleResponse(
+ final HttpRequest promise,
+ final Message<HttpResponse, Void> responseMessage) throws IOException, HttpException {
+ final HttpResponse response = responseMessage.getHead();
+ logResult(TestResult.OK, target, promise, response,
+ "pushed / " + response.getFirstHeader("server"));
+ countDownLatch.countDown();
+ }
+
+ @Override
+ protected void handleError(
+ final HttpRequest promise,
+ final Exception cause) {
+ logResult(TestResult.NOK, target, promise, null, "(" + cause.getMessage() + ")");
+ countDownLatch.countDown();
+ }
+ };
+ }
+ },
+ null,
+ null);
+ final Message<HttpResponse, String> message = future.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
+ final HttpResponse response = message.getHead();
+ final int code = response.getCode();
+ if (code == HttpStatus.SC_OK) {
+ logResult(TestResult.OK, target, httpget, response,
+ Objects.toString(response.getFirstHeader("server")));
+ if (!countDownLatch.await(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit())) {
+ logResult(TestResult.NOK, target, null, null, "Push messages not received");
}
+ } else {
+ logResult(TestResult.NOK, target, httpget, response, "(status " + code + ")");
}
- resultMap.put(request.getRequestUri(), entry);
- } else {
- break;
+ } catch (final ExecutionException ex) {
+ final Throwable cause = ex.getCause();
+ logResult(TestResult.NOK, target, null, null, "(" + cause.getMessage() + ")");
+ } catch (final TimeoutException ex) {
+ logResult(TestResult.NOK, target, null, null, "(time out)");
}
}
- 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());
+ }
+
+ void executeHttpBin(final HttpHost target) throws Exception {
+ {
+ System.out.println("*** httpbin.org HTTP/1.1 simple request execution ***");
+
+ final List<Message<HttpRequest, AsyncEntityProducer>> requestMessages = Arrays.asList(
+ new Message<HttpRequest, AsyncEntityProducer>(
+ new BasicHttpRequest(Methods.GET, target, "/headers"),
+ null),
+ new Message<HttpRequest, AsyncEntityProducer>(
+ new BasicHttpRequest(Methods.POST, target, "/anything"),
+ new StringAsyncEntityProducer("some important message", ContentType.TEXT_PLAIN)),
+ new Message<HttpRequest, AsyncEntityProducer>(
+ new BasicHttpRequest(Methods.PUT, target, "/anything"),
+ new StringAsyncEntityProducer("some important message", ContentType.TEXT_PLAIN)),
+ new Message<HttpRequest, AsyncEntityProducer>(
+ new BasicHttpRequest(Methods.GET, target, "/drip"),
+ null),
+ new Message<HttpRequest, AsyncEntityProducer>(
+ new BasicHttpRequest(Methods.GET, target, "/bytes/20000"),
+ null),
+ new Message<HttpRequest, AsyncEntityProducer>(
+ new BasicHttpRequest(Methods.GET, target, "/delay/2"),
+ null),
+ new Message<HttpRequest, AsyncEntityProducer>(
+ new BasicHttpRequest(Methods.POST, target, "/delay/2"),
+ new StringAsyncEntityProducer("some important message", ContentType.TEXT_PLAIN)),
+ new Message<HttpRequest, AsyncEntityProducer>(
+ new BasicHttpRequest(Methods.PUT, target, "/delay/2"),
+ new StringAsyncEntityProducer("some important message", ContentType.TEXT_PLAIN))
+ );
+
+ for (final Message<HttpRequest, AsyncEntityProducer> message : requestMessages) {
+ final CountDownLatch countDownLatch = new CountDownLatch(1);
+ final HttpRequest request = message.getHead();
+ final AsyncEntityProducer entityProducer = message.getBody();
+ client.execute(
+ new BasicRequestProducer(request, entityProducer),
+ new BasicResponseConsumer<>(new StringAsyncEntityConsumer(CharCodingConfig.custom()
+ .setCharset(StandardCharsets.US_ASCII)
+ .setMalformedInputAction(CodingErrorAction.IGNORE)
+ .setUnmappableInputAction(CodingErrorAction.REPLACE)
+ .build())),
+ TIMEOUT,
+ new FutureCallback<Message<HttpResponse, String>>() {
+
+ @Override
+ public void completed(final Message<HttpResponse, String> responseMessage) {
+ final HttpResponse response = responseMessage.getHead();
+ final int code = response.getCode();
+ if (code == HttpStatus.SC_OK) {
+ logResult(TestResult.OK, target, request, response,
+ Objects.toString(response.getFirstHeader("server")));
+ } else {
+ logResult(TestResult.NOK, target, request, response, "(status " + code + ")");
+ }
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void failed(final Exception ex) {
+ logResult(TestResult.NOK, target, request, null, "(" + ex.getMessage() + ")");
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void cancelled() {
+ logResult(TestResult.NOK, target, request, null, "(cancelled)");
+ countDownLatch.countDown();
+ }
+ });
+ if (!countDownLatch.await(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit())) {
+ logResult(TestResult.NOK, target, null, null, "(httpbin.org tests failed to complete in time)");
}
}
}
- if (h2Config.isPushEnabled() && resultMap.isEmpty()) {
- System.out.println("NOK: pushed responses expected");
- }
+ {
+ System.out.println("*** httpbin.org HTTP/1.1 pipelined request execution ***");
+
+ final Future<AsyncClientEndpoint> connectFuture = client.connect(target, TIMEOUT);
+ final AsyncClientEndpoint streamEndpoint = connectFuture.get();
+
+ final int n = 10;
+ final CountDownLatch countDownLatch = new CountDownLatch(n);
+ for (int i = 0; i < n; i++) {
+
+ final HttpRequest request;
+ final AsyncEntityProducer entityProducer;
+ if (i % 2 == 0) {
+ request = new BasicHttpRequest(Methods.GET, target, "/headers");
+ entityProducer = null;
+ } else {
+ request = new BasicHttpRequest(Methods.POST, target, "/anything");
+ entityProducer = new StringAsyncEntityProducer("some important message", ContentType.TEXT_PLAIN);
+ }
- 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());
+ streamEndpoint.execute(
+ new BasicRequestProducer(request, entityProducer),
+ new BasicResponseConsumer<>(new StringAsyncEntityConsumer(CharCodingConfig.custom()
+ .setCharset(StandardCharsets.US_ASCII)
+ .setMalformedInputAction(CodingErrorAction.IGNORE)
+ .setUnmappableInputAction(CodingErrorAction.REPLACE)
+ .build())),
+ new FutureCallback<Message<HttpResponse, String>>() {
+
+ @Override
+ public void completed(final Message<HttpResponse, String> responseMessage) {
+ final HttpResponse response = responseMessage.getHead();
+ final int code = response.getCode();
+ if (code == HttpStatus.SC_OK) {
+ logResult(TestResult.OK, target, request, response,
+ "pipelined / " + response.getFirstHeader("server"));
+ } else {
+ logResult(TestResult.NOK, target, request, response, "(status " + code + ")");
+ }
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void failed(final Exception ex) {
+ logResult(TestResult.NOK, target, request, null, "(" + ex.getMessage() + ")");
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void cancelled() {
+ logResult(TestResult.NOK, target, request, null, "(cancelled)");
+ countDownLatch.countDown();
+ }
+ });
+ }
+ if (!countDownLatch.await(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit())) {
+ logResult(TestResult.NOK, target, null, null, "(httpbin.org tests failed to complete in time)");
}
}
}
- 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;
+ enum TestResult {OK, NOK}
+
+ private void logResult(
+ final TestResult result,
+ final HttpHost httpHost,
+ final HttpRequest request,
+ final HttpResponse response,
+ final String message) {
+ final StringBuilder buf = new StringBuilder();
+ buf.append(result);
+ if (buf.length() == 2) {
+ buf.append(" ");
}
-
+ buf.append(": ").append(httpHost).append(" ");
+ if (response != null) {
+ buf.append(response.getVersion()).append(" ");
+ }
+ if (request != null) {
+ buf.append(request.getMethod()).append(" ").append(request.getRequestUri());
+ }
+ if (message != null && !TextUtils.isBlank(message)) {
+ buf.append(" -> ").append(message);
+ }
+ System.out.println(buf.toString());
}
}