summaryrefslogtreecommitdiff
path: root/server/mpm/experimental/perchild
diff options
context:
space:
mode:
authorDoug MacEachern <dougm@apache.org>2001-04-24 02:17:21 +0000
committerDoug MacEachern <dougm@apache.org>2001-04-24 02:17:21 +0000
commiteda57913d1fd30154daff34d2a236285da1e31b2 (patch)
treeca931d6a6dd9d191bb1fe98d1ff99fe61b9f964b /server/mpm/experimental/perchild
parentc196a6ab1f3d7682713851791fc723fa0876d0cb (diff)
downloadhttpd-eda57913d1fd30154daff34d2a236285da1e31b2.tar.gz
adjust to ap_get_brigade() / input filter api changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88925 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/experimental/perchild')
-rw-r--r--server/mpm/experimental/perchild/perchild.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 4555bb11ce..0fa14997b1 100644
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -1362,6 +1362,7 @@ static int pass_request(request_rec *r)
&mpm_perchild_module);
char *foo;
apr_size_t len;
+ apr_size_t readbytes = 0;
apr_pool_userdata_get((void **)&foo, "PERCHILD_BUFFER", r->connection->pool);
len = strlen(foo);
@@ -1397,7 +1398,7 @@ static int pass_request(request_rec *r)
write(sconf->sd2, foo, len);
- while (ap_get_brigade(r->input_filters, bb, AP_MODE_NONBLOCKING) == APR_SUCCESS) {
+ while (ap_get_brigade(r->input_filters, bb, AP_MODE_NONBLOCKING, &readbytes) == APR_SUCCESS) {
apr_bucket *e;
APR_BRIGADE_FOREACH(e, bb) {
const char *str;
@@ -1491,7 +1492,7 @@ static int perchild_post_read(request_rec *r)
return OK;
}
-static apr_status_t perchild_buffer(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode)
+static apr_status_t perchild_buffer(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode, apr_size_t *readbytes)
{
apr_bucket *e;
apr_status_t rv;
@@ -1499,7 +1500,7 @@ static apr_status_t perchild_buffer(ap_filter_t *f, apr_bucket_brigade *b, ap_in
const char *str;
apr_size_t len;
- if ((rv = ap_get_brigade(f->next, b, mode)) != APR_SUCCESS) {
+ if ((rv = ap_get_brigade(f->next, b, mode, readbytes)) != APR_SUCCESS) {
return rv;
}