httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server request.c
Date Wed, 27 Jun 2001 20:46:54 GMT
wrowe       01/06/27 13:46:54

  Modified:    server   request.c
  Log:
    Pull the common cruft from ap_sub_req_lookup_*() fns.
  
  Revision  Changes    Path
  1.10      +2 -50     httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- request.c	2001/06/27 20:44:00	1.9
  +++ request.c	2001/06/27 20:46:52	1.10
  @@ -874,31 +874,7 @@
       char *udir;
   
       rnew = make_sub_request(r);
  -    rnew->hostname       = r->hostname;
  -    rnew->request_time   = r->request_time;
  -    rnew->connection     = r->connection;
  -    rnew->server         = r->server;
  -
  -    rnew->request_config = ap_create_request_config(rnew->pool);
  -
  -    rnew->htaccess       = r->htaccess;
  -    rnew->allowed_methods = ap_make_method_list(rnew->pool, 2);
  -
  -    /* make a copy of the allowed-methods list */
  -    ap_copy_method_list(rnew->allowed_methods, r->allowed_methods);
  -
  -    /* start with the same set of output filters */
  -    if (next_filter) {
  -        rnew->output_filters = next_filter;
  -    }
  -    else {
  -        rnew->output_filters = r->output_filters;
  -    }
  -    ap_add_output_filter("SUBREQ_CORE", NULL, rnew, rnew->connection); 
  -
  -    /* no input filters for a subrequest */
  -
  -    ap_set_sub_req_protocol(rnew, r);
  +    fill_in_sub_req_vars(rnew, r, next_filter);
   
       rnew->per_dir_config = r->server->lookup_defaults;
   
  @@ -987,31 +963,7 @@
       char *fdir;
   
       rnew = make_sub_request(r);
  -    rnew->hostname       = r->hostname;
  -    rnew->request_time   = r->request_time;
  -    rnew->connection     = r->connection;
  -    rnew->server         = r->server;
  -
  -    rnew->request_config = ap_create_request_config(rnew->pool);
  -
  -    rnew->htaccess       = r->htaccess;
  -    rnew->allowed_methods = ap_make_method_list(rnew->pool, 2);
  -
  -    /* make a copy of the allowed-methods list */
  -    ap_copy_method_list(rnew->allowed_methods, r->allowed_methods);
  -
  -    /* start with the same set of output filters */
  -    if (next_filter) {
  -        rnew->output_filters = next_filter;
  -    }
  -    else {
  -        rnew->output_filters = r->output_filters;
  -    }
  -    ap_add_output_filter("SUBREQ_CORE", NULL, rnew, rnew->connection); 
  -
  -    /* no input filters for a subrequest */
  -
  -    ap_set_sub_req_protocol(rnew, r);
  +    fill_in_sub_req_vars(rnew, r, next_filter);
   
       rnew->chunked        = r->chunked;
   
  
  
  

Mime
View raw message