Attachment 30006 Details for Bug 51747 – Updated patch against 2.3.7

[patch] Updated patch against 2.3.7

fcgid_chunked_io.patch (text/plain), 1.51 KB, created by Dominic Benson on 2013-02-28 22:11:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dominic Benson

Created: 2013-02-28 22:11:38 UTC

Size: 1.51 KB

patch

obsolete

>diff -rupN mod_fcgid-2.3.7/modules/fcgid/fcgid_proc_unix.c mod_fcgid-2.3.7.new/modules/fcgid/fcgid_proc_unix.c
>--- mod_fcgid-2.3.7/modules/fcgid/fcgid_proc_unix.c	2012-04-17 12:21:22.000000000 +0100
>+++ mod_fcgid-2.3.7.new/modules/fcgid/fcgid_proc_unix.c	2013-02-28 21:48:30.877838065 +0000
>@@ -774,10 +774,11 @@ apr_status_t proc_write_ipc(fcgid_ipc *i
>     struct iovec vec[FCGID_VEC_COUNT];
>     int nvec = 0;
>     apr_bucket *e;
>+    apr_bucket_brigade* tmpbb = apr_brigade_create(output_brigade->p,output_brigade->bucket_alloc);
>+
>+    while ((e = APR_BRIGADE_FIRST(output_brigade)) != APR_BRIGADE_SENTINEL(output_brigade)) {
>+        APR_BUCKET_REMOVE(e);
> 
>-    for (e = APR_BRIGADE_FIRST(output_brigade);
>-         e != APR_BRIGADE_SENTINEL(output_brigade);
>-         e = APR_BUCKET_NEXT(e)) {
>         apr_size_t len;
>         const char* base;
> 
>@@ -792,6 +793,8 @@ apr_status_t proc_write_ipc(fcgid_ipc *i
>             return rv;
>         }
> 
>+        APR_BRIGADE_INSERT_TAIL(tmpbb, e);
>+
>         vec[nvec].iov_len = len;
>         vec[nvec].iov_base = (char*) base;
>         if (nvec == (FCGID_VEC_COUNT - 1)) {
>@@ -801,6 +804,7 @@ apr_status_t proc_write_ipc(fcgid_ipc *i
>                                FCGID_VEC_COUNT)) != APR_SUCCESS)
>                 return rv;
>             nvec = 0;
>+            apr_brigade_cleanup(tmpbb);
>         }
>         else
>             nvec++;
>@@ -812,6 +816,7 @@ apr_status_t proc_write_ipc(fcgid_ipc *i
>             return rv;
>     }
> 
>+    apr_brigade_destroy(tmpbb);
>     return APR_SUCCESS;
> }

Actions: View | Diff

Attachments on bug 51747: 27448 | 30006 | 30093 | 33050