Changeset 2377 for trunk/server/common/patches/httpd-SSLCompression.patch
- Timestamp:
- Feb 27, 2013, 3:56:23 AM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/server/common/patches/httpd-SSLCompression.patch
r2321 r2377 2 2 Origin: http://svn.apache.org/viewvc?view=revision&revision=1369585 3 3 4 diff - Naur httpd-2.2.22/modules/ssl/mod_ssl.c httpd-2.2.22.patched/modules/ssl/mod_ssl.c5 --- httpd-2.2.2 2/modules/ssl/mod_ssl.c 2010-07-12 14:47:45.000000000 -04006 +++ httpd-2.2.2 2.patched/modules/ssl/mod_ssl.c 2012-09-12 17:10:57.417861707 -04007 @@ -1 46,6 +146,9 @@8 "( `[+-][SSLv2|SSLv3|TLSv1] ...' - see manual)")4 diff -r -U3 httpd-2.2.23/modules/ssl/mod_ssl.c httpd-2.2.23.patched/modules/ssl/mod_ssl.c 5 --- httpd-2.2.23/modules/ssl/mod_ssl.c 2013-02-14 18:32:59.360289681 -0500 6 +++ httpd-2.2.23.patched/modules/ssl/mod_ssl.c 2013-02-14 18:34:22.670718893 -0500 7 @@ -158,6 +158,9 @@ 8 "('[+-][" SSL_PROTOCOLS "] ...' - see manual)") 9 9 SSL_CMD_SRV(HonorCipherOrder, FLAG, 10 10 "Use the server's cipher ordering preference") … … 15 15 "Enable support for insecure renegotiation") 16 16 SSL_CMD_ALL(UserName, TAKE1, 17 diff - Naur httpd-2.2.22/modules/ssl/ssl_engine_config.c httpd-2.2.22.patched/modules/ssl/ssl_engine_config.c18 --- httpd-2.2.2 2/modules/ssl/ssl_engine_config.c 2011-04-14 09:56:17.000000000 -040019 +++ httpd-2.2.2 2.patched/modules/ssl/ssl_engine_config.c 2012-09-12 17:10:57.425862035 -040020 @@ -1 78,6 +178,9 @@17 diff -r -U3 httpd-2.2.23/modules/ssl/ssl_engine_config.c httpd-2.2.23.patched/modules/ssl/ssl_engine_config.c 18 --- httpd-2.2.23/modules/ssl/ssl_engine_config.c 2013-02-14 18:32:59.358289719 -0500 19 +++ httpd-2.2.23.patched/modules/ssl/ssl_engine_config.c 2013-02-14 18:34:22.672718856 -0500 20 @@ -183,6 +183,9 @@ 21 21 #ifdef HAVE_FIPS 22 22 sc->fips = UNSET; … … 28 28 modssl_ctx_init_proxy(sc, p); 29 29 30 @@ -2 75,6 +278,9 @@30 @@ -281,6 +284,9 @@ 31 31 #ifdef HAVE_FIPS 32 32 cfgMergeBool(fips); … … 38 38 modssl_ctx_cfg_merge_proxy(base->proxy, add->proxy, mrg->proxy); 39 39 40 @@ -7 08,6 +714,23 @@40 @@ -714,6 +720,23 @@ 41 41 42 42 } … … 62 62 { 63 63 #ifdef SSL_OP_CIPHER_SERVER_PREFERENCE 64 diff -Naur httpd-2.2.22/modules/ssl/ssl_engine_init.c httpd-2.2.22.patched/modules/ssl/ssl_engine_init.c 65 --- httpd-2.2.22/modules/ssl/ssl_engine_init.c 2011-04-14 09:56:17.000000000 -0400 66 +++ httpd-2.2.22.patched/modules/ssl/ssl_engine_init.c 2012-09-12 17:10:57.419861789 -0400 67 @@ -503,6 +503,18 @@ 64 Only in httpd-2.2.23.patched/modules/ssl: ssl_engine_config.c.orig 65 diff -r -U3 httpd-2.2.23/modules/ssl/ssl_engine_init.c httpd-2.2.23.patched/modules/ssl/ssl_engine_init.c 66 --- httpd-2.2.23/modules/ssl/ssl_engine_init.c 2013-02-14 18:32:59.358289719 -0500 67 +++ httpd-2.2.23.patched/modules/ssl/ssl_engine_init.c 2013-02-14 18:34:22.672718856 -0500 68 @@ -542,6 +542,18 @@ 68 69 } 69 70 #endif … … 84 85 if (sc->insecure_reneg == TRUE) { 85 86 SSL_CTX_set_options(ctx, SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION); 86 diff -Naur httpd-2.2.22/modules/ssl/ssl_private.h httpd-2.2.22.patched/modules/ssl/ssl_private.h 87 --- httpd-2.2.22/modules/ssl/ssl_private.h 2011-04-14 09:56:17.000000000 -0400 88 +++ httpd-2.2.22.patched/modules/ssl/ssl_private.h 2012-09-12 18:11:48.762900287 -0400 89 @@ -486,6 +486,9 @@ 87 Only in httpd-2.2.23.patched/modules/ssl: ssl_engine_init.c.orig 88 diff -r -U3 httpd-2.2.23/modules/ssl/ssl_private.h httpd-2.2.23.patched/modules/ssl/ssl_private.h 89 --- httpd-2.2.23/modules/ssl/ssl_private.h 2013-02-14 18:32:59.357289737 -0500 90 +++ httpd-2.2.23.patched/modules/ssl/ssl_private.h 2013-02-14 18:34:22.673718837 -0500 91 @@ -507,6 +507,9 @@ 90 92 #ifdef HAVE_FIPS 91 93 BOOL fips; … … 97 99 98 100 /** 99 @@ -5 42,6 +545,7 @@101 @@ -563,6 +566,7 @@ 100 102 const char *ssl_cmd_SSLCARevocationPath(cmd_parms *, void *, const char *); 101 103 const char *ssl_cmd_SSLCARevocationFile(cmd_parms *, void *, const char *); … … 105 107 const char *ssl_cmd_SSLVerifyDepth(cmd_parms *, void *, const char *); 106 108 const char *ssl_cmd_SSLSessionCache(cmd_parms *, void *, const char *); 107 diff -Naur httpd-2.2.22/modules/ssl/ssl_toolkit_compat.h httpd-2.2.22.patched/modules/ssl/ssl_toolkit_compat.h 108 --- httpd-2.2.22/modules/ssl/ssl_toolkit_compat.h 2010-07-12 14:47:45.000000000 -0400 109 +++ httpd-2.2.22.patched/modules/ssl/ssl_toolkit_compat.h 2012-09-12 18:12:09.982772267 -0400 110 @@ -276,6 +276,11 @@ 109 Only in httpd-2.2.23.patched/modules/ssl: ssl_private.h.orig 110 diff -r -U3 httpd-2.2.23/modules/ssl/ssl_toolkit_compat.h httpd-2.2.23.patched/modules/ssl/ssl_toolkit_compat.h 111 --- httpd-2.2.23/modules/ssl/ssl_toolkit_compat.h 2012-08-17 13:30:46.000000000 -0400 112 +++ httpd-2.2.23.patched/modules/ssl/ssl_toolkit_compat.h 2013-02-14 18:34:22.674718818 -0500 113 @@ -277,6 +277,11 @@ 111 114 #endif 112 115 #endif … … 120 123 121 124 /** @} */ 125 Only in httpd-2.2.23.patched/modules/ssl: ssl_toolkit_compat.h.orig
Note: See TracChangeset
for help on using the changeset viewer.