--- a/components/apache24/Makefile	Wed Jun 22 11:11:34 2016 +0200
+++ b/components/apache24/Makefile	Tue Jul 26 06:21:56 2016 -0700
@@ -26,15 +26,15 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		apache2
-COMPONENT_VERSION=	2.4.20
+COMPONENT_VERSION=	2.4.23
 COMPONENT_PROJECT_URL=	http://httpd.apache.org/
 COMPONENT_SRC_NAME=	httpd
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:e77482a46e5b6971ba6181b71a3c0ed1dbf3fa83810bf767c6320f0c621261e4
+    sha256:b71a13f56b8061c6b4086fdcc9ffdddd904449735eadec0f0e2947e33eec91d7
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/httpd/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/apache
 
-TPNO=	27725
+TPNO=	30187
 
 CONFIGURE_DEFAULT_DIRS=no
 TEST_TARGET= $(NO_TESTS)
@@ -59,6 +59,8 @@
 CONFIGURE_OPTIONS +=	--enable-layout=Solaris
 CONFIGURE_OPTIONS +=	--enable-mpms-shared=all
 CONFIGURE_OPTIONS +=	--enable-mods-shared=all
+# workaround for a known issue with 2.4.23 (should be probably removed with 2.4.24) 
+CONFIGURE_OPTIONS +=	--enable-proxy-fdpass
 CONFIGURE_OPTIONS +=	--enable-exception-hook
 CONFIGURE_OPTIONS +=	--enable-cgi
 CONFIGURE_OPTIONS +=	--enable-suexec

--- a/components/apache24/apache-24.p5m	Wed Jun 22 11:11:34 2016 +0200
+++ b/components/apache24/apache-24.p5m	Tue Jul 26 06:21:56 2016 -0700
@@ -241,6 +241,7 @@
 file path=usr/apache2/2.4/libexec/mod_proxy_fcgi.so
 $(SOLARIS_12_ONLY)file path=usr/apache2/2.4/libexec/mod_proxy_fdpass.so
 file path=usr/apache2/2.4/libexec/mod_proxy_ftp.so
+file path=usr/apache2/2.4/libexec/mod_proxy_hcheck.so
 file path=usr/apache2/2.4/libexec/mod_proxy_html.so
 file path=usr/apache2/2.4/libexec/mod_proxy_http.so
 file path=usr/apache2/2.4/libexec/mod_proxy_scgi.so
@@ -370,6 +371,7 @@
 file path=usr/apache2/2.4/manual/expr.html.fr
 file path=usr/apache2/2.4/manual/faq/index.html
 file path=usr/apache2/2.4/manual/faq/index.html.en
+file path=usr/apache2/2.4/manual/faq/index.html.es
 file path=usr/apache2/2.4/manual/faq/index.html.fr
 file path=usr/apache2/2.4/manual/faq/index.html.tr.utf8
 file path=usr/apache2/2.4/manual/faq/index.html.zh-cn.utf8
@@ -419,6 +421,8 @@
 file path=usr/apache2/2.4/manual/howto/htaccess.html.ja.utf8
 file path=usr/apache2/2.4/manual/howto/htaccess.html.ko.euc-kr
 file path=usr/apache2/2.4/manual/howto/htaccess.html.pt-br
+file path=usr/apache2/2.4/manual/howto/http2.html
+file path=usr/apache2/2.4/manual/howto/http2.html.en
 file path=usr/apache2/2.4/manual/howto/index.html
 file path=usr/apache2/2.4/manual/howto/index.html.en
 file path=usr/apache2/2.4/manual/howto/index.html.fr
@@ -900,12 +904,16 @@
 file path=usr/apache2/2.4/manual/mod/mod_proxy_ftp.html
 file path=usr/apache2/2.4/manual/mod/mod_proxy_ftp.html.en
 file path=usr/apache2/2.4/manual/mod/mod_proxy_ftp.html.fr
+file path=usr/apache2/2.4/manual/mod/mod_proxy_hcheck.html
+file path=usr/apache2/2.4/manual/mod/mod_proxy_hcheck.html.en
 file path=usr/apache2/2.4/manual/mod/mod_proxy_html.html
 file path=usr/apache2/2.4/manual/mod/mod_proxy_html.html.en
 file path=usr/apache2/2.4/manual/mod/mod_proxy_html.html.fr
 file path=usr/apache2/2.4/manual/mod/mod_proxy_http.html
 file path=usr/apache2/2.4/manual/mod/mod_proxy_http.html.en
 file path=usr/apache2/2.4/manual/mod/mod_proxy_http.html.fr
+file path=usr/apache2/2.4/manual/mod/mod_proxy_http2.html
+file path=usr/apache2/2.4/manual/mod/mod_proxy_http2.html.en
 file path=usr/apache2/2.4/manual/mod/mod_proxy_scgi.html
 file path=usr/apache2/2.4/manual/mod/mod_proxy_scgi.html.en
 file path=usr/apache2/2.4/manual/mod/mod_proxy_scgi.html.fr

--- a/components/apache24/patches/bug54719.patch	Wed Jun 22 11:11:34 2016 +0200
+++ b/components/apache24/patches/bug54719.patch	Tue Jul 26 06:21:56 2016 -0700
@@ -5,7 +5,7 @@
 
 --- server/main.c
 +++ server/main.c
-@@ -685,6 +688,21 @@
+@@ -691,6 +694,21 @@
          }
      }
  

--- a/components/apache24/patches/bug56753.patch	Wed Jun 22 11:11:34 2016 +0200
+++ b/components/apache24/patches/bug56753.patch	Tue Jul 26 06:21:56 2016 -0700
@@ -16,7 +16,7 @@
      lua_gettable(L, 2);
 --- modules/lua/lua_config.c
 +++ modules/lua/lua_config.c
-@@ -263,13 +263,13 @@
+@@ -264,13 +264,13 @@
      lua_pushvalue(L, -1);
  
      lua_setfield(L, -2, "__index");
@@ -34,7 +34,7 @@
  }
 --- modules/lua/lua_request.c
 +++ modules/lua/lua_request.c
-@@ -2889,7 +2889,7 @@
+@@ -2890,7 +2890,7 @@
      lua_pushvalue(L, -1);
  
      lua_setfield(L, -2, "__index");
@@ -43,7 +43,7 @@
  
      lua_pop(L, 2);
  
-@@ -2897,7 +2897,7 @@
+@@ -2898,7 +2898,7 @@
      lua_pushvalue(L, -1);
  
      lua_setfield(L, -2, "__index");
@@ -52,7 +52,7 @@
  
      lua_pop(L, 2);
  
-@@ -2905,7 +2905,7 @@
+@@ -2906,7 +2906,7 @@
      lua_pushvalue(L, -1);
  
      lua_setfield(L, -2, "__index");

--- a/components/apache24/patches/no_ssl3.patch	Wed Jun 22 11:11:34 2016 +0200
+++ b/components/apache24/patches/no_ssl3.patch	Tue Jul 26 06:21:56 2016 -0700
@@ -16,7 +16,7 @@
  #endif
 --- docs/manual/mod/mod_ssl.html.en
 +++ docs/manual/mod/mod_ssl.html.en
-@@ -1440,11 +1440,7 @@
+@@ -1454,11 +1454,7 @@
  
  <li><code>all</code>
      <p>
@@ -31,7 +31,7 @@
  </div>
 --- docs/manual/mod/mod_ssl.html.fr
 +++ docs/manual/mod/mod_ssl.html.fr
-@@ -1626,11 +1626,7 @@
+@@ -1635,11 +1635,7 @@
  
  <li><code>all</code>
      <p>

--- a/components/apache24/patches/priv_drop.patch	Wed Jun 22 11:11:34 2016 +0200
+++ b/components/apache24/patches/priv_drop.patch	Tue Jul 26 06:21:56 2016 -0700
@@ -14,7 +14,7 @@
  /* WARNING: Win32 binds http_main.c dynamically to the server. Please place
   *          extern functions and global data in another appropriate module.
   *
-@@ -452,6 +454,7 @@
+@@ -454,6 +456,7 @@
      apr_status_t rv;
      module **mod;
      const char *opt_arg;
@@ -22,7 +22,7 @@
      APR_OPTIONAL_FN_TYPE(ap_signal_server) *signal_server;
      int rc = OK;
  
-@@ -789,6 +907,17 @@
+@@ -794,6 +912,17 @@
  
          ap_run_optional_fn_retrieve();