www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Trying to tie up some loose ends:

Browse Source 
- Return immediately if the return val of ap_pass_brigade != APR_SUCCESS
- Return a bit earlier when dealing with input filters, so as to not build up a huge backlog.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1377685 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daniel Gruno
2012-08-27 13:57:43 +00:00
parent b947d24d85
commit 5ee40b970d
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/lua/mod_lua.c
View File

@@ -390,6 +390,7 @@ static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade
lua_filter_ctx* ctx; lua_filter_ctx* ctx;
conn_rec *c = r->connection; conn_rec *c = r->connection;
apr_bucket *pbktIn; apr_bucket *pbktIn;
apr_status_t rv;
/* Set up the initial filter context and acquire the function. /* Set up the initial filter context and acquire the function.
* The corresponding Lua function should yield here. * The corresponding Lua function should yield here.
@@ -433,8 +434,11 @@ static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade
pbktOut = apr_bucket_heap_create(output, olen, NULL, pbktOut = apr_bucket_heap_create(output, olen, NULL,
c->bucket_alloc); c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(ctx->tmpBucket, pbktOut); APR_BRIGADE_INSERT_TAIL(ctx->tmpBucket, pbktOut);
ap_pass_brigade(f->next, ctx->tmpBucket); rv = ap_pass_brigade(f->next, ctx->tmpBucket);
apr_brigade_cleanup(ctx->tmpBucket); apr_brigade_cleanup(ctx->tmpBucket);
if (rv != APR_SUCCESS) {
return rv;
}
} }
else { else {
ctx->broken = 1; ctx->broken = 1;
@@ -462,7 +466,11 @@ static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade
pbktEOS = apr_bucket_eos_create(c->bucket_alloc); pbktEOS = apr_bucket_eos_create(c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(ctx->tmpBucket, pbktEOS); APR_BRIGADE_INSERT_TAIL(ctx->tmpBucket, pbktEOS);
ap_lua_release_state(L, ctx->spec, r); ap_lua_release_state(L, ctx->spec, r);
ap_pass_brigade(f->next, ctx->tmpBucket); rv = ap_pass_brigade(f->next, ctx->tmpBucket);
apr_brigade_cleanup(ctx->tmpBucket);
if (rv != APR_SUCCESS) {
return rv;
}
} }
} }
/* Clean up */ /* Clean up */
@@ -549,6 +557,7 @@ static apr_status_t lua_input_filter_handle(ap_filter_t *f,
pbktOut = apr_bucket_heap_create(output, olen, 0, c->bucket_alloc); pbktOut = apr_bucket_heap_create(output, olen, 0, c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(pbbOut, pbktOut); APR_BRIGADE_INSERT_TAIL(pbbOut, pbktOut);
apr_bucket_delete(pbktIn); apr_bucket_delete(pbktIn);
return APR_SUCCESS;
} }
else { else {
ctx->broken = 1; ctx->broken = 1;