]> granicus.if.org Git - apache/commit
Merge r1795834, r1828912, r1830943, r1830944, r1832991 from trunk:
authorJim Jagielski <jim@apache.org>
Mon, 2 Jul 2018 12:49:16 +0000 (12:49 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 2 Jul 2018 12:49:16 +0000 (12:49 +0000)
commit5d4f5b1ecf68a60baa4d2c5194f0cc6c2c1557e3
tree049e88429bf5a234f3a5c3937323b28d29859c21
parentbe7dfb3ad3fedc051a4e494b829762eb03e4076f
Merge r1795834, r1828912, r1830943, r1830944, r1832991 from trunk:

Remove empty line.

* modules/ssl/ssl_util.c (ssl_util_vhostid): Simplify code,
  no functional change.

Save a few cycles and simlify code.

Use apr_pstrmemdup instead of apr_pstrndup when possible.
Avoid scanning the first 2 bytes when looking for the | delimiter. it is known to be "${".
Avoid comma separated statements, it is not that usual.

Save a few cycles.

Use apr_pstrmemdup instead of apr_pstrndup when possible.

* modules/proxy/mod_proxy_hcheck.c (sctx_t, hc_create_config):
  Remove unused bucket allocator created off pconf.
  Tag the subpool.

Submitted by: jailletc36, jorton, jailletc36, jailletc36, jorton
Reviewed by: jailletc36, covener, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834844 13f79535-47bb-0310-9956-ffa450edef68
STATUS
modules/filters/mod_proxy_html.c
modules/metadata/mod_env.c
modules/proxy/mod_proxy_hcheck.c
modules/ssl/ssl_util.c