[patch] Revised patch fixing a bug introduced in the previous update for 2.3.7

150_fcgid_chunked_io (text/plain), 1.62 KB, created by Dominic Benson on 2013-03-21 16:32:05 UTC

(hide)

Description: Revised patch fixing a bug introduced in the previous update for 2.3.7

Filename:

MIME Type:

Creator: Dominic Benson

Created: 2013-03-21 16:32:05 UTC

Size: 1.62 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-03-21 15:13:00.981565487 +0000 >@@ -774,14 +774,16 @@ 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 (!APR_BRIGADE_EMPTY(output_brigade)) { >+ e = APR_BRIGADE_FIRST(output_brigade); > >- 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; > > if (APR_BUCKET_IS_METADATA(e)) { >+ apr_bucket_delete(e); > continue; > } > >@@ -792,6 +794,9 @@ apr_status_t proc_write_ipc(fcgid_ipc *i > return rv; > } > >+ APR_BUCKET_REMOVE(e); >+ 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 +806,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 +818,7 @@ apr_status_t proc_write_ipc(fcgid_ipc *i > return rv; > } > >+ apr_brigade_destroy(tmpbb); > return APR_SUCCESS; > } > View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]