Attachment 30307 Details for Bug 49382 – update of patch attachment ID # 28564, with failed hunks removed

[patch] update of patch attachment ID # 28564, with failed hunks removed

bug-49382.patch (text/plain), 1.19 KB, created by Matthew Hall on 2013-05-22 02:45:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Hall

Created: 2013-05-22 02:45:28 UTC

Size: 1.19 KB

patch

obsolete

>--- ab.c.org	2011-10-02 04:48:14.000000000 +0900
>+++ ab.c	2012-04-09 21:29:33.761620438 +0900
>@@ -95,7 +95,7 @@ 
>  * ab - or to due to a change in the distribution it is compiled with
>  * (such as an APR change in for example blocking).
>  */
>-#define AP_AB_BASEREVISION "2.3"
>+#define AP_AB_BASEREVISION "2.4"
> 
> /*
>  * BUGS:
>@@ -1338,7 +1334,7 @@ 
>     if (c->ssl) {
>         status = SSL_read(c->ssl, buffer, r);
>         if (status <= 0) {
>-            int scode = SSL_get_error(c->ssl, status);
>+            int scode = (status == 0 ? SSL_ERROR_ZERO_RETURN : SSL_get_error(c->ssl, status));
> 
>             if (scode == SSL_ERROR_ZERO_RETURN) {
>                 /* connection closed cleanly: */
>@@ -1611,7 +1607,11 @@ 
> 
>     if (!opt_useragent) {
>         /* User-Agent: header not overridden, add default value to hdrs */
>-        hdrs = apr_pstrcat(cntxt, hdrs, "User-Agent: ApacheBench/", AP_AB_BASEREVISION, "\r\n", NULL);
>+        hdrs = apr_pstrcat(cntxt, hdrs, "User-Agent: ApacheBench/", AP_AB_BASEREVISION,
>+#ifdef USE_SSL
>+            " (", SSLeay_version(SSLEAY_VERSION), ")",
>+#endif
>+            "\r\n", NULL);
>     }
>     else {
>         /* Header overridden, no need to add, as it is already in hdrs */

Actions: View | Diff

Attachments on bug 49382: 25520 | 28435 | 28564 | 30307