Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
24353766 Upgrade Apache Web Server to version 2.4.23 s11u3-sru
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 23 Aug 2016 06:07:43 -0700
branchs11u3-sru
changeset 6722 f675056be479
parent 6719 f08057f6a8dc
child 6723 ec9e4505813f
24353766 Upgrade Apache Web Server to version 2.4.23 23734918 problem in UTILITY/APACHE 23197423 mod_proxy.so core after upgrade from Apache2.2 to Apache2.4 in S11.3
components/apache24/Makefile file | annotate | diff | comparison | revisions
components/apache24/apache-24.p5m file | annotate | diff | comparison | revisions
components/apache24/apache.license file | annotate | diff | comparison | revisions
components/apache24/patches/bug54719.patch file | annotate | diff | comparison | revisions
components/apache24/patches/no_ssl3.patch file | annotate | diff | comparison | revisions
components/apache24/patches/priv_drop.patch file | annotate | diff | comparison | revisions
components/apache24/patches/ssl-fips-140.patch file | annotate | diff | comparison | revisions 
--- a/components/apache24/Makefile	Fri Sep 02 10:15:32 2016 -0700
+++ b/components/apache24/Makefile	Tue Aug 23 06:07:43 2016 -0700
@@ -18,22 +18,22 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		apache2
-COMPONENT_VERSION=	2.4.16
+COMPONENT_VERSION=	2.4.23
 COMPONENT_PROJECT_URL=	http://httpd.apache.org/
 COMPONENT_SRC_NAME=	httpd
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:2fc18017801944cfcfde76a24f16c1276c866c2a6e512ee895f566bef9368fae
+    sha256:b71a13f56b8061c6b4086fdcc9ffdddd904449735eadec0f0e2947e33eec91d7
 COMPONENT_ARCHIVE_URL=	http://archive.apache.org/dist/httpd/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/apache
 
-TPNO=	23618
+TPNO=	30187
 	
 CONFIGURE_DEFAULT_DIRS=no
 
@@ -41,6 +41,9 @@
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
+# Newer compiler is needed to fix 23197423.
+SPRO_VROOT = $(SPRO_ROOT)/solarisstudio12.4
+
 ASLR_MODE = $(ASLR_ENABLE)
 
 PATCH_LEVEL=0
--- a/components/apache24/apache-24.p5m	Fri Sep 02 10:15:32 2016 -0700
+++ b/components/apache24/apache-24.p5m	Tue Aug 23 06:07:43 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file link hardlink path=usr/apache2/2.4/build/.* -> \
@@ -153,6 +153,7 @@
 file path=usr/apache2/2.4/include/mod_session.h
 file path=usr/apache2/2.4/include/mod_so.h
 file path=usr/apache2/2.4/include/mod_ssl.h
+file path=usr/apache2/2.4/include/mod_ssl_openssl.h
 file path=usr/apache2/2.4/include/mod_status.h
 file path=usr/apache2/2.4/include/mod_unixd.h
 file path=usr/apache2/2.4/include/mod_watchdog.h
@@ -243,6 +244,7 @@
 file path=usr/apache2/2.4/libexec/mod_proxy_express.so
 file path=usr/apache2/2.4/libexec/mod_proxy_fcgi.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
@@ -372,6 +374,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
@@ -421,6 +424,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
@@ -433,12 +438,17 @@
 file path=usr/apache2/2.4/manual/howto/public_html.html.ja.utf8
 file path=usr/apache2/2.4/manual/howto/public_html.html.ko.euc-kr
 file path=usr/apache2/2.4/manual/howto/public_html.html.tr.utf8
+file path=usr/apache2/2.4/manual/howto/reverse_proxy.html
+file path=usr/apache2/2.4/manual/howto/reverse_proxy.html.en
 file path=usr/apache2/2.4/manual/howto/ssi.html
 file path=usr/apache2/2.4/manual/howto/ssi.html.en
 file path=usr/apache2/2.4/manual/howto/ssi.html.fr
 file path=usr/apache2/2.4/manual/howto/ssi.html.ja.utf8
 file path=usr/apache2/2.4/manual/howto/ssi.html.ko.euc-kr
 file path=usr/apache2/2.4/manual/images/apache_header.gif
+file path=usr/apache2/2.4/manual/images/bal-man-b.png
+file path=usr/apache2/2.4/manual/images/bal-man-w.png
+file path=usr/apache2/2.4/manual/images/bal-man.png
 file path=usr/apache2/2.4/manual/images/build_a_mod_2.png
 file path=usr/apache2/2.4/manual/images/build_a_mod_3.png
 file path=usr/apache2/2.4/manual/images/build_a_mod_4.png
@@ -465,6 +475,7 @@
 file path=usr/apache2/2.4/manual/images/mod_rewrite_fig2.gif
 file path=usr/apache2/2.4/manual/images/mod_rewrite_fig2.png
 file path=usr/apache2/2.4/manual/images/pixel.gif
+file path=usr/apache2/2.4/manual/images/reverse-proxy-arch.png
 file path=usr/apache2/2.4/manual/images/rewrite_backreferences.png
 file path=usr/apache2/2.4/manual/images/rewrite_process_uri.png
 file path=usr/apache2/2.4/manual/images/rewrite_rule_flow.png
@@ -786,6 +797,8 @@
 file path=usr/apache2/2.4/manual/mod/mod_heartmonitor.html
 file path=usr/apache2/2.4/manual/mod/mod_heartmonitor.html.en
 file path=usr/apache2/2.4/manual/mod/mod_heartmonitor.html.fr
+file path=usr/apache2/2.4/manual/mod/mod_http2.html
+file path=usr/apache2/2.4/manual/mod/mod_http2.html.en
 file path=usr/apache2/2.4/manual/mod/mod_ident.html
 file path=usr/apache2/2.4/manual/mod/mod_ident.html.en
 file path=usr/apache2/2.4/manual/mod/mod_ident.html.fr
@@ -894,12 +907,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/apache.license	Fri Sep 02 10:15:32 2016 -0700
+++ b/components/apache24/apache.license	Tue Aug 23 06:07:43 2016 -0700
@@ -1,5 +1,5 @@
 Apache HTTP Server
-Copyright 2015 The Apache Software Foundation.
+Copyright 2016 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
--- a/components/apache24/patches/bug54719.patch	Fri Sep 02 10:15:32 2016 -0700
+++ b/components/apache24/patches/bug54719.patch	Tue Aug 23 06:07:43 2016 -0700
@@ -5,7 +5,7 @@
 
 --- server/main.c
 +++ server/main.c
-@@ -685,6 +688,21 @@
+@@ -691,6 +694,21 @@
          }
      }
  
--- a/components/apache24/patches/no_ssl3.patch	Fri Sep 02 10:15:32 2016 -0700
+++ b/components/apache24/patches/no_ssl3.patch	Tue Aug 23 06:07:43 2016 -0700
@@ -5,40 +5,41 @@
 
 --- modules/ssl/ssl_private.h
 +++ modules/ssl/ssl_private.h
-@@ -298,10 +298,10 @@
- #ifdef HAVE_TLSV1_X
- #define SSL_PROTOCOL_TLSV1_1 (1<<3)
- #define SSL_PROTOCOL_TLSV1_2 (1<<4)
--#define SSL_PROTOCOL_ALL   (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1| \
-+#define SSL_PROTOCOL_ALL   (SSL_PROTOCOL_TLSV1| \
-                             SSL_PROTOCOL_TLSV1_1|SSL_PROTOCOL_TLSV1_2)
+@@ -302,7 +302,7 @@
+ #endif
+ #define SSL_PROTOCOL_TLSV1 (1<<2)
+ #ifndef OPENSSL_NO_SSL3
+-#define SSL_PROTOCOL_BASIC (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1)
++#define SSL_PROTOCOL_BASIC (SSL_PROTOCOL_TLSV1)
  #else
--#define SSL_PROTOCOL_ALL   (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1)
-+#define SSL_PROTOCOL_ALL   (SSL_PROTOCOL_TLSV1)
+ #define SSL_PROTOCOL_BASIC (SSL_PROTOCOL_TLSV1)
  #endif
- typedef int ssl_proto_t;
- 
 --- docs/manual/mod/mod_ssl.html.en
 +++ docs/manual/mod/mod_ssl.html.en
-@@ -1369,9 +1361,7 @@
+@@ -1454,11 +1454,7 @@
  
  <li><code>all</code>
      <p>
 -    This is a shortcut for ``<code>+SSLv3 +TLSv1</code>'' or
 -    - when using OpenSSL 1.0.1 and later -
--    ``<code>+SSLv3 +TLSv1 +TLSv1.1 +TLSv1.2</code>, respectively.</p></li>
+-    ``<code>+SSLv3 +TLSv1 +TLSv1.1 +TLSv1.2</code>'', respectively
+-    (except for OpenSSL versions compiled with the ``no-ssl3'' configuration
+-    option, where <code>all</code> does not include <code>+SSLv3</code>).</p></li>
 +    This is a shortcut for ``<code>+TLSv1 +TLSv1.1 +TLSv1.2</code>''.</p></li>
  </ul>
  <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">SSLProtocol TLSv1</pre>
  </div>
 --- docs/manual/mod/mod_ssl.html.fr
 +++ docs/manual/mod/mod_ssl.html.fr
-@@ -1548,8 +1545,7 @@
+@@ -1635,11 +1635,7 @@
  
  <li><code>all</code>
      <p>
 -    C'est un raccourci pour ``<code>+SSLv3 +TLSv1</code>'' ou - � partir
--    de la version 1.0.1 d'OpenSSL - ``<code>+SSLv3 +TLSv1 +TLSv1.1 +TLSv1.2</code>.</p></li>
+-    de la version 1.0.1 d'OpenSSL - ``<code>+SSLv3 +TLSv1 +TLSv1.1
+-    +TLSv1.2</code>'' (sauf si OpenSSL a �t� compil� avec l'option
+-    ``no-ssl3'', auquel cas <code>all</code> n'inclura pas
+-    <code>+SSLv3</code>).</p></li>
 +    C'est un raccourci pour ``<code>+TLSv1 +TLSv1.1 +TLSv1.2</code>''.</p></li>
  </ul>
  <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">SSLProtocol TLSv1</pre>
--- a/components/apache24/patches/priv_drop.patch	Fri Sep 02 10:15:32 2016 -0700
+++ b/components/apache24/patches/priv_drop.patch	Tue Aug 23 06:07:43 2016 -0700
@@ -14,15 +14,15 @@
  /* 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;
 +    priv_set_t *tset;
      APR_OPTIONAL_FN_TYPE(ap_signal_server) *signal_server;
+     int rc = OK;
  
-     AP_MONCONTROL(0); /* turn off profiling of startup */
-@@ -788,6 +806,17 @@
+@@ -794,6 +912,17 @@
  
          ap_run_optional_fn_retrieve();
  
@@ -38,5 +38,5 @@
 +        }
 +
          ap_main_state = AP_SQ_MS_RUN_MPM;
-         if (ap_run_mpm(pconf, plog, ap_server_conf) != OK)
-             break;
+         rc = ap_run_mpm(pconf, plog, ap_server_conf);
+ 
--- a/components/apache24/patches/ssl-fips-140.patch	Fri Sep 02 10:15:32 2016 -0700
+++ b/components/apache24/patches/ssl-fips-140.patch	Tue Aug 23 06:07:43 2016 -0700
@@ -52,18 +52,3 @@
  dnl #  end of module specific part
  APACHE_MODPATH_FINISH
  
---- acinclude.m4
-+++ acinclude.m4
-@@ -591,6 +591,12 @@
-   ])
-   if test "x$ac_cv_openssl" = "xyes"; then
-     AC_DEFINE(HAVE_OPENSSL, 1, [Define if OpenSSL is available])
-+
-+    APR_ADDTO(MOD_LDFLAGS, [$ap_openssl_libs])
-+    APR_ADDTO(LIBS, [$ap_openssl_libs])
-+    APR_SETVAR(ab_LDFLAGS, [$MOD_LDFLAGS])
-+    APACHE_SUBST(ab_CFLAGS)
-+    APACHE_SUBST(ab_LDFLAGS)
-   fi
- ])
-
upstream/oracle/userland-gate