httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard mod_cgi.c mod_cgid.c
Date Mon, 18 Sep 2000 01:24:55 GMT
rbb         00/09/17 18:24:55

  Modified:    src/include httpd.h
               src/main http_core.c http_protocol.c http_request.c
                        util_filter.c
               src/modules/standard mod_cgi.c mod_cgid.c
  Log:
  Change r->filters to r->output_filters.  This sets things up for us to
  put input filters into Apache.
  
  Revision  Changes    Path
  1.86      +7 -2      apache-2.0/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- httpd.h	2000/09/13 01:58:13	1.85
  +++ httpd.h	2000/09/18 01:24:53	1.86
  @@ -808,10 +808,15 @@
       struct ap_rr_xlate *rrx;
   #endif /*APACHE_XLATE*/
   
  -    /** A list of filters to be used for this request 
  +    /** A list of output filters to be used for this request 
        *  @defvar ap_filter_t *filters */
  -    struct ap_filter_t *filters;
  +    struct ap_filter_t *output_filters;
  +    /** A flag to determine if the eos bucket has been sent yet
  +     *  @defvar int eos_sent */
       int eos_sent;
  +    /** A list of output filters to be used for this request 
  +     *  @defvar ap_filter_t *filters */
  +    struct ap_filter_t *input_filters;
   
   /* Things placed at the end of the record to avoid breaking binary
    * compatibility.  It would be nice to remember to reorder the entire
  
  
  
  1.124     +1 -1      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.123
  retrieving revision 1.124
  diff -u -r1.123 -r1.124
  --- http_core.c	2000/09/14 18:42:54	1.123
  +++ http_core.c	2000/09/18 01:24:53	1.124
  @@ -186,7 +186,7 @@
       conf->add_default_charset = ADD_DEFAULT_CHARSET_UNSET;
       conf->add_default_charset_name = DEFAULT_ADD_DEFAULT_CHARSET_NAME;
   
  -    conf->filters = apr_make_array(a, 40, sizeof(void *));
  +    conf->filters = apr_make_array(a, 2, sizeof(void *));
       return (void *)conf;
   }
   
  
  
  
  1.127     +7 -7      apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- http_protocol.c	2000/09/14 20:43:14	1.126
  +++ http_protocol.c	2000/09/18 01:24:54	1.127
  @@ -1358,7 +1358,7 @@
       bb = ap_brigade_create(r->pool);
       b = ap_bucket_create_eos();
       AP_BRIGADE_INSERT_TAIL(bb, b);
  -    ap_pass_brigade(r->filters, bb);
  +    ap_pass_brigade(r->output_filters, bb);
   }
   
   void ap_finalize_sub_req_protocol(request_rec *sub)
  @@ -2742,7 +2742,7 @@
       bb = ap_brigade_create(r->pool);
       b = ap_bucket_create_mmap(mm, 0, mm->size);
       AP_BRIGADE_INSERT_TAIL(bb, b);
  -    ap_pass_brigade(r->filters, bb);
  +    ap_pass_brigade(r->output_filters, bb);
   
       return mm->size; /* XXX - change API to report apr_status_t? */
   }
  @@ -2761,7 +2761,7 @@
       bb = ap_brigade_create(r->pool);
       b = ap_bucket_create_transient(&c2, 1);
       AP_BRIGADE_INSERT_TAIL(bb, b);
  -    ap_pass_brigade(r->filters, bb);
  +    ap_pass_brigade(r->output_filters, bb);
   
       return c;
   }
  @@ -2781,7 +2781,7 @@
       bb = ap_brigade_create(r->pool);
       b = ap_bucket_create_transient(str, len);
       AP_BRIGADE_INSERT_TAIL(bb, b);
  -    ap_pass_brigade(r->filters, bb);
  +    ap_pass_brigade(r->output_filters, bb);
   
       return len;
   }
  @@ -2799,7 +2799,7 @@
       bb = ap_brigade_create(r->pool);
       b = ap_bucket_create_transient(buf, nbyte);
       AP_BRIGADE_INSERT_TAIL(bb, b);
  -    ap_pass_brigade(r->filters, bb);
  +    ap_pass_brigade(r->output_filters, bb);
       return nbyte;
   }
   
  @@ -2814,7 +2814,7 @@
       bb = ap_brigade_create(r->pool);
       written = ap_brigade_vprintf(bb, fmt, va);
       if (written != 0)
  -        ap_pass_brigade(r->filters, bb);
  +        ap_pass_brigade(r->output_filters, bb);
       return written;
   }
   
  @@ -2849,7 +2849,7 @@
       written = ap_brigade_vputstrs(bb, va);
       va_end(va);
       if (written != 0)
  -        ap_pass_brigade(r->filters, bb);
  +        ap_pass_brigade(r->output_filters, bb);
       return written;
   }
   
  
  
  
  1.49      +2 -2      apache-2.0/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_request.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- http_request.c	2000/09/14 20:43:14	1.48
  +++ http_request.c	2000/09/18 01:24:54	1.49
  @@ -778,7 +778,7 @@
       ap_copy_method_list(rnew->allowed_methods, r->allowed_methods);
   
       /* start with the same set of output filters */
  -    rnew->filters = r->filters;
  +    rnew->output_filters = r->output_filters;
   
       ap_set_sub_req_protocol(rnew, r);
   
  @@ -873,7 +873,7 @@
       ap_copy_method_list(rnew->allowed_methods, r->allowed_methods);
   
       /* start with the same set of output filters */
  -    rnew->filters = r->filters;
  +    rnew->output_filters = r->output_filters;
   
       ap_set_sub_req_protocol(rnew, r);
       fdir = ap_make_dirstr_parent(rnew->pool, r->filename);
  
  
  
  1.19      +5 -5      apache-2.0/src/main/util_filter.c
  
  Index: util_filter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_filter.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- util_filter.c	2000/09/14 05:08:42	1.18
  +++ util_filter.c	2000/09/18 01:24:54	1.19
  @@ -111,12 +111,12 @@
               f->ctx = ctx;
               f->r = r;
   
  -            if (INSERT_BEFORE(f, r->filters)) {
  -                f->next = r->filters;
  -                r->filters = f;
  +            if (INSERT_BEFORE(f, r->output_filters)) {
  +                f->next = r->output_filters;
  +                r->output_filters = f;
               }
               else {
  -                ap_filter_t *fscan = r->filters;
  +                ap_filter_t *fscan = r->output_filters;
                   while (!INSERT_BEFORE(f, fscan->next))
                       fscan = fscan->next;
                   f->next = fscan->next;
  @@ -131,7 +131,7 @@
   /* Pass the buckets to the next filter in the filter stack.  If the
    * current filter is a handler, we should get NULL passed in instead of
    * the current filter.  At that point, we can just call the first filter in
  - * the stack, or r->filters.
  + * the stack, or r->output_filters.
    */
   API_EXPORT(apr_status_t) ap_pass_brigade(ap_filter_t *next, ap_bucket_brigade *bb)
   {
  
  
  
  1.63      +2 -2      apache-2.0/src/modules/standard/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgi.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- mod_cgi.c	2000/09/09 06:48:10	1.62
  +++ mod_cgi.c	2000/09/18 01:24:55	1.63
  @@ -661,7 +661,7 @@
   	    AP_BRIGADE_INSERT_TAIL(bb, b);
               b = ap_bucket_create_eos();
   	    AP_BRIGADE_INSERT_TAIL(bb, b);
  -	    ap_pass_brigade(r->filters, bb);
  +	    ap_pass_brigade(r->output_filters, bb);
   	}
   
           log_script_err(r, script_err);
  @@ -674,7 +674,7 @@
   	AP_BRIGADE_INSERT_TAIL(bb, b);
   	b = ap_bucket_create_eos();
   	AP_BRIGADE_INSERT_TAIL(bb, b);
  -        ap_pass_brigade(r->filters, bb);
  +        ap_pass_brigade(r->output_filters, bb);
       }
   
       return OK;			/* NOT r->status, even if it has changed. */
  
  
  
  1.41      +2 -2      apache-2.0/src/modules/standard/mod_cgid.c
  
  Index: mod_cgid.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgid.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- mod_cgid.c	2000/09/12 14:48:49	1.40
  +++ mod_cgid.c	2000/09/18 01:24:55	1.41
  @@ -1014,7 +1014,7 @@
               AP_BRIGADE_INSERT_TAIL(bb, b);
               b = ap_bucket_create_eos();
               AP_BRIGADE_INSERT_TAIL(bb, b);
  -            ap_pass_brigade(r->filters, bb);
  +            ap_pass_brigade(r->output_filters, bb);
           } 
       } 
   
  @@ -1024,7 +1024,7 @@
           AP_BRIGADE_INSERT_TAIL(bb, b);
           b = ap_bucket_create_eos();
           AP_BRIGADE_INSERT_TAIL(bb, b);
  -        ap_pass_brigade(r->filters, bb);
  +        ap_pass_brigade(r->output_filters, bb);
       } 
   
       apr_close(tempsock);
  
  
  

Mime
View raw message