httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rainer Jung <rainer.j...@kippdata.de>
Subject Re: The drive for 2.4.26
Date Sun, 28 May 2017 14:16:02 GMT
Am 28.05.2017 um 13:13 schrieb Jan Ehrhardt:
> Rainer Jung in gmane.comp.apache.devel (Fri, 21 Apr 2017 00:29:38
> +0200):
>> Thanks for the analysis. So the following patch on trunk works for me
>> when using OpenSSL 1.0.1e (on Solaris 10):
>>
>> Index: support/ab.c
>> ===================================================================
>> --- support/ab.c        (revision 1792155)
>> +++ support/ab.c        (working copy)
>> @@ -2576,8 +2576,6 @@
>>  #else
>>  #if OPENSSL_VERSION_NUMBER < 0x10100000L
>>      CRYPTO_malloc_init();
>> -#else
>> -    OPENSSL_malloc_init();
>>  #endif
>>  #endif
>>      SSL_load_error_strings();
>>
>>
>> The same fix should apply for 2.4.x.
>
> @Jacob Champion: thanks for submitting this patch and backporting it to
> the 2.4.x branch.
>
>> In addition I noticed the following glitch:
>>
>> Index: support/ab.c
>> ===================================================================
>> --- support/ab.c        (revision 1792155)
>> +++ support/ab.c        (working copy)
>> @@ -2465,14 +2465,14 @@
>>              case 'B':
>>                  myhost = apr_pstrdup(cntxt, opt_arg);
>>                  break;
>> +            case 'm':
>> +                method = CUSTOM_METHOD;
>> +                method_str[CUSTOM_METHOD] = strdup(opt_arg);
>> +                break;
>>  #ifdef USE_SSL
>>              case 'Z':
>>                  ssl_cipher = strdup(opt_arg);
>>                  break;
>> -            case 'm':
>> -                method = CUSTOM_METHOD;
>> -                method_str[CUSTOM_METHOD] = strdup(opt_arg);
>> -                break;
>>              case 'f':
>>  #if OPENSSL_VERSION_NUMBER < 0x10100000L
>>                  if (strncasecmp(opt_arg, "ALL", 3) == 0) {
>>
>>
>> The "-m" option is independent of SSL use and should be handled outside
>> of "#ifdef USE_SSL".
>
> This patch is not submitted. Any idea why? After all, the help text of
> 'ab' mentions ' -m method  Method name', but for instance '-m HEAD' has
> no effect al all with 'ab', only with 'abs'.

Thanks for the reminder. Fixed in r1796493 for trunk and 2.4.x backport 
proposal added.

Regards,

Rainer

Mime
View raw message