Commit 4b1472d4 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

back out filter change that is preventing headers to be sent 

PR:
Obtained from:
Submitted by: john sterling
Reviewed by:	dougm


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

modules/http/http_core.c

+0 −8
Original line number Diff line number Diff line
@@ -295,13 +295,6 @@ static int ap_process_http_connection(conn_rec *c) 
    return OK;

}



static void ap_http_insert_filter(request_rec *r)

{

    ap_add_output_filter("BYTERANGE", NULL, r, r->connection);

    ap_add_output_filter("CONTENT_LENGTH", NULL, r, r->connection);

    ap_add_output_filter("HTTP_HEADER", NULL, r, r->connection);

}



static void register_hooks(apr_pool_t *p)

{

    ap_hook_pre_connection(ap_pre_http_connection,NULL,NULL,
@@ -311,7 +304,6 @@ static void register_hooks(apr_pool_t *p) 
    ap_hook_http_method(http_method,NULL,NULL,APR_HOOK_REALLY_LAST);

    ap_hook_default_port(http_port,NULL,NULL,APR_HOOK_REALLY_LAST);



    ap_hook_insert_filter(ap_http_insert_filter, NULL, NULL, APR_HOOK_REALLY_LAST);

    ap_register_input_filter("HTTP_IN", ap_http_filter, AP_FTYPE_CONNECTION);

    ap_register_input_filter("DECHUNK", ap_dechunk_filter, AP_FTYPE_TRANSCODE);

    ap_register_output_filter("HTTP_HEADER", ap_http_header_filter,

modules/http/http_request.c

+4 −0
Original line number Diff line number Diff line
@@ -517,6 +517,10 @@ static request_rec *internal_internal_redirect(const char *new_uri, 
    new->output_filters  = r->connection->output_filters;

    new->input_filters   = r->connection->input_filters;



    ap_add_output_filter("BYTERANGE", NULL, new, new->connection);

    ap_add_output_filter("CONTENT_LENGTH", NULL, new, new->connection);

    ap_add_output_filter("HTTP_HEADER", NULL, new, new->connection);

      

    apr_table_setn(new->subprocess_env, "REDIRECT_STATUS",

	apr_psprintf(r->pool, "%d", r->status));

server/protocol.c

+5 −0
Original line number Diff line number Diff line
@@ -590,6 +590,11 @@ request_rec *ap_read_request(conn_rec *conn) 
                     ? r->server->keep_alive_timeout * APR_USEC_PER_SEC

                     : r->server->timeout * APR_USEC_PER_SEC));

                     

    ap_add_output_filter("BYTERANGE", NULL, r, r->connection);

    ap_add_output_filter("CONTENT_LENGTH", NULL, r, r->connection);

    ap_add_output_filter("HTTP_HEADER", NULL, r, r->connection);

       

         

    /* Get the request... */

    if (!read_request_line(r)) {

        if (r->status == HTTP_REQUEST_URI_TOO_LARGE) {