Commit 274cb811 authored by Brian Pane's avatar Brian Pane
Browse files

New version of ap_core_output_filter that does nonblocking writes 

(backport from async-dev branch to 2.3 trunk)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327872 13f79535-47bb-0310-9956-ffa450edef68
parent 921a9e84

CHANGES

+2 −0
Changes for CHANGES: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]









  *) Rewrite of ap_coreoutput_filter to do nonblocking writes  [Brian Pane]

















  *) Added new connection states for handler and write completion









     [Brian Pane]










































include/httpd.h



+5
−5



























Changes for include/httpd.h: 5 added lines, 5 removed lines.



Original line number
Diff line number
Diff line







@@ -1066,6 +1066,8 @@ struct conn_rec {







    conn_state_t *cs;









    /** Is there data pending in the input filters? */ 









    int data_in_input_filters;









    /** Is there data pending in the output filters? */









    int data_in_output_filters;









};



















/** 










@@ -1198,11 +1200,9 @@ struct server_rec {







};



















typedef struct core_output_filter_ctx {









    apr_bucket_brigade *b;









    /** subpool of c->pool used for resources 









     * which may outlive the request









     */









    apr_pool_t *deferred_write_pool;









    apr_bucket_brigade *buffered_bb;









    apr_size_t bytes_in;









    apr_size_t bytes_written;









} core_output_filter_ctx_t;









 









typedef struct core_filter_ctx {


































server/core_filters.c



+340
−512




























File changed.
Preview size limit exceeded, changes collapsed.