You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2009/09/27 13:59:11 UTC
svn commit: r819289 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/ssl/ssl_engine_vars.c modules/ssl/ssl_toolkit_compat.h support/ab.c
Author: minfrin
Date: Sun Sep 27 11:59:10 2009
New Revision: 819289
URL: http://svn.apache.org/viewvc?rev=819289&view=rev
Log:
...promote.
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c
httpd/httpd/branches/2.2.x/modules/ssl/ssl_toolkit_compat.h
httpd/httpd/branches/2.2.x/support/ab.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=819289&r1=819288&r2=819289&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sun Sep 27 11:59:10 2009
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.15
+ *) ab, mod_ssl: restore compatibility with OpenSSL < 0.9.7g which we broke
+ with r801527 (backport r819242, r819245). Reported on the list by Jie
+ Gao. [Guenter Knauf]
Changes with Apache 2.2.14
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=819289&r1=819288&r2=819289&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun Sep 27 11:59:10 2009
@@ -87,11 +87,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * ab, mod_ssl: restore compatibility with OpenSSL < 0.9.7g which we broke
- with r801527 (backport r819242, r819245). Reported on the list by Jie Gao.
- 2.2.x Patch: http://people.apache.org/~fuankg/diffs/openssl-0.9.7g-compat-2.2.x.diff
- +1: fuankg, rpluem, minfrin
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c?rev=819289&r1=819288&r2=819289&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c Sun Sep 27 11:59:10 2009
@@ -626,7 +626,7 @@
ssl_var_lookup_ssl_cipher_bits(ssl, &usekeysize, &algkeysize);
if (ssl && strEQ(var, "")) {
- const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl);
+ MODSSL_SSL_CIPHER_CONST SSL_CIPHER *cipher = SSL_get_current_cipher(ssl);
result = (cipher != NULL ? (char *)SSL_CIPHER_get_name(cipher) : NULL);
}
else if (strcEQ(var, "_EXPORT"))
@@ -647,7 +647,7 @@
static void ssl_var_lookup_ssl_cipher_bits(SSL *ssl, int *usekeysize, int *algkeysize)
{
- const SSL_CIPHER *cipher;
+ MODSSL_SSL_CIPHER_CONST SSL_CIPHER *cipher;
*usekeysize = 0;
*algkeysize = 0;
Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_toolkit_compat.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_toolkit_compat.h?rev=819289&r1=819288&r2=819289&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_toolkit_compat.h (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_toolkit_compat.h Sun Sep 27 11:59:10 2009
@@ -93,8 +93,10 @@
/** ...shifting sands of openssl... */
#if (OPENSSL_VERSION_NUMBER >= 0x0090707f)
# define MODSSL_D2I_SSL_SESSION_CONST const
+# define MODSSL_SSL_CIPHER_CONST const
#else
# define MODSSL_D2I_SSL_SESSION_CONST
+# define MODSSL_SSL_CIPHER_CONST
#endif
#if (OPENSSL_VERSION_NUMBER >= 0x00908000)
Modified: httpd/httpd/branches/2.2.x/support/ab.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/ab.c?rev=819289&r1=819288&r2=819289&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/ab.c (original)
+++ httpd/httpd/branches/2.2.x/support/ab.c Sun Sep 27 11:59:10 2009
@@ -189,11 +189,18 @@
#endif
-#if defined(USE_SSL) && (OPENSSL_VERSION_NUMBER >= 0x00909000)
+#if defined(USE_SSL)
+#if (OPENSSL_VERSION_NUMBER >= 0x00909000)
#define AB_SSL_METHOD_CONST const
#else
#define AB_SSL_METHOD_CONST
#endif
+#if (OPENSSL_VERSION_NUMBER >= 0x0090707f)
+#define AB_SSL_CIPHER_CONST const
+#else
+#define AB_SSL_CIPHER_CONST
+#endif
+#endif
#include <math.h>
#if APR_HAVE_CTYPE_H
@@ -486,7 +493,7 @@
static int ssl_print_connection_info(BIO *bio, SSL *ssl)
{
- const SSL_CIPHER *c;
+ AB_SSL_CIPHER_CONST SSL_CIPHER *c;
int alg_bits,bits;
c = SSL_get_current_cipher(ssl);
@@ -572,7 +579,7 @@
if (verbosity >= 2)
ssl_print_info(c);
if (ssl_info == NULL) {
- const SSL_CIPHER *ci;
+ AB_SSL_CIPHER_CONST SSL_CIPHER *ci;
X509 *cert;
int sk_bits, pk_bits, swork;
Re: svn commit: r819289 - in /httpd/httpd/branches/2.2.x: CHANGES
STATUS modules/ssl/ssl_engine_vars.c modules/ssl/ssl_toolkit_compat.h support/ab.c
Posted by Guenter Knauf <fu...@apache.org>.
Hi,
Jeff Trawick schrieb:
> It is fine to use a commit log of simply "promote" for STATUS, if that
> is all that is modified. (I used to enjoy Justin's updates here on what
> jazz album he was listening to... I guess people use Twitter for that now.)
>
> When you commit code, you need to include a real commit log, regardless
> of the branch. Look at the information available for the last two
> updates to this file, then look at earlier commits:
>
> http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c
I've just fixed the logs.
Gün.
Re: svn commit: r819289 - in /httpd/httpd/branches/2.2.x: CHANGES
STATUS modules/ssl/ssl_engine_vars.c modules/ssl/ssl_toolkit_compat.h
support/ab.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Mon, Sep 28, 2009 at 5:53 AM, Graham Leggett <mi...@sharp.fm> wrote:
> Jeff Trawick wrote:
>
> > When you commit code, you need to include a real commit log, regardless
> > of the branch.
>
> Will do.
>
> Thanks to fuankg for fixing the log message for me.
>
> Regards,
> Graham
> --
>
Thanks to both!
Re: svn commit: r819289 - in /httpd/httpd/branches/2.2.x: CHANGES
STATUS modules/ssl/ssl_engine_vars.c modules/ssl/ssl_toolkit_compat.h support/ab.c
Posted by Graham Leggett <mi...@sharp.fm>.
Jeff Trawick wrote:
> When you commit code, you need to include a real commit log, regardless
> of the branch.
Will do.
Thanks to fuankg for fixing the log message for me.
Regards,
Graham
--
Re: svn commit: r819289 - in /httpd/httpd/branches/2.2.x: CHANGES
STATUS modules/ssl/ssl_engine_vars.c modules/ssl/ssl_toolkit_compat.h support/ab.c
Posted by Ruediger Pluem <rp...@apache.org>.
On 09/27/2009 08:31 PM, Jeff Trawick wrote:
> On Sun, Sep 27, 2009 at 7:59 AM, <mi...@apache.org> wrote:
>
>> Author: minfrin
>> Date: Sun Sep 27 11:59:10 2009
>> New Revision: 819289
>>
>> URL: http://svn.apache.org/viewvc?rev=819289&view=rev
>> Log:
>> ...promote.
>>
>> Modified:
>> httpd/httpd/branches/2.2.x/CHANGES
>> httpd/httpd/branches/2.2.x/STATUS
>> httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c
>> httpd/httpd/branches/2.2.x/modules/ssl/ssl_toolkit_compat.h
>> httpd/httpd/branches/2.2.x/support/ab.c
>>
>
> It is fine to use a commit log of simply "promote" for STATUS, if that is
> all that is modified. (I used to enjoy Justin's updates here on what jazz
> album he was listening to... I guess people use Twitter for that now.)
>
> When you commit code, you need to include a real commit log, regardless of
> the branch. Look at the information available for the last two updates to
> this file, then look at earlier commits:
>
> http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c
>
+1
Regards
Rüdiger
Re: svn commit: r819289 - in /httpd/httpd/branches/2.2.x: CHANGES
STATUS modules/ssl/ssl_engine_vars.c modules/ssl/ssl_toolkit_compat.h
support/ab.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Sun, Sep 27, 2009 at 7:59 AM, <mi...@apache.org> wrote:
> Author: minfrin
> Date: Sun Sep 27 11:59:10 2009
> New Revision: 819289
>
> URL: http://svn.apache.org/viewvc?rev=819289&view=rev
> Log:
> ...promote.
>
> Modified:
> httpd/httpd/branches/2.2.x/CHANGES
> httpd/httpd/branches/2.2.x/STATUS
> httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c
> httpd/httpd/branches/2.2.x/modules/ssl/ssl_toolkit_compat.h
> httpd/httpd/branches/2.2.x/support/ab.c
>
It is fine to use a commit log of simply "promote" for STATUS, if that is
all that is modified. (I used to enjoy Justin's updates here on what jazz
album he was listening to... I guess people use Twitter for that now.)
When you commit code, you need to include a real commit log, regardless of
the branch. Look at the information available for the last two updates to
this file, then look at earlier commits:
http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c
Re: svn commit: r819289 - in /httpd/httpd/branches/2.2.x: CHANGES
STATUS modules/ssl/ssl_engine_vars.c modules/ssl/ssl_toolkit_compat.h
support/ab.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Sun, Sep 27, 2009 at 7:59 AM, <mi...@apache.org> wrote:
> Author: minfrin
> Date: Sun Sep 27 11:59:10 2009
> New Revision: 819289
>
> URL: http://svn.apache.org/viewvc?rev=819289&view=rev
> Log:
> ...promote.
>
> Modified:
> httpd/httpd/branches/2.2.x/CHANGES
> httpd/httpd/branches/2.2.x/STATUS
> httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_vars.c
> httpd/httpd/branches/2.2.x/modules/ssl/ssl_toolkit_compat.h
> httpd/httpd/branches/2.2.x/support/ab.c
>
just another data point:
with 2.2.14 on Solaris 10 + bundled OpenSSL + Sun Studio 12, I got the slew
of warnings but no build failure
this is S10 U5 with this level of OpenSSL:
OpenSSL 0.9.7d 17 Mar 2004 (+ security patches to 2006-09-29)
this patch clears it up for me