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_cgid.c
Date Mon, 11 Sep 2000 00:30:02 GMT
rbb         00/09/10 17:30:02

  Modified:    src      CHANGES
               src/modules/standard mod_cgid.c
  Log:
  Modify mod_cgid to use bucket brigades.  This means that mod_cgid behaves
  like mod_cgi, creating a single element bucket brigade that is passed to
  the next filter.  This is instead of making mod_cgid read from the socket,
  and call ap_r* repeatedly.
  
  Revision  Changes    Path
  1.219     +4 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.218
  retrieving revision 1.219
  diff -u -r1.218 -r1.219
  --- CHANGES	2000/09/10 22:09:07	1.218
  +++ CHANGES	2000/09/11 00:30:01	1.219
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0a7
  +  *) Mod_cgid now creates a single element bucket brigade, with a pipe
  +     bucket, instead of using BUFF's and ap_r*.
  +     [Ryan Bloom]
  +
     *) APRVARS.in no longer overwrites the EXTRA_LIBS variable.
        [Mike Abbott <mja@sgi.com>]
   
  
  
  
  1.38      +41 -32    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.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- mod_cgid.c	2000/08/23 00:01:57	1.37
  +++ mod_cgid.c	2000/09/11 00:30:02	1.38
  @@ -78,6 +78,8 @@
   #include "apr_general.h"
   #include "apr_file_io.h"
   #include "apr_portable.h"
  +#include "ap_buckets.h"
  +#include "util_filter.h"
   #include "httpd.h" 
   #include "http_config.h" 
   #include "http_request.h" 
  @@ -736,7 +738,7 @@
   } 
   
   static int log_script(request_rec *r, cgid_server_conf * conf, int ret, 
  -                  char *dbuf, const char *sbuf, BUFF *script_in, BUFF *script_err) 
  +                  char *dbuf, const char *sbuf, apr_file_t *script_in, apr_file_t *script_err)

   { 
       apr_array_header_t *hdrs_arr = apr_table_elts(r->headers_in); 
       apr_table_entry_t *hdrs = (apr_table_entry_t *) hdrs_arr->elts; 
  @@ -752,10 +754,10 @@
            (apr_open(&f, ap_server_root_relative(r->pool, conf->logname), 
                     APR_APPEND|APR_WRITE|APR_CREATE, APR_OS_DEFAULT, r->pool) != APR_SUCCESS))
{ 
           /* Soak up script output */ 
  -        while (ap_bgets(argsbuffer, HUGE_STRING_LEN, script_in) > 0) 
  +        while (apr_fgets(argsbuffer, HUGE_STRING_LEN, script_in) == 0) 
               continue; 
           if (script_err) {
  -            while (ap_bgets(argsbuffer, HUGE_STRING_LEN, script_err) > 0) 
  +            while (apr_fgets(argsbuffer, HUGE_STRING_LEN, script_err) == 0) 
                   continue; 
           }
           return ret; 
  @@ -792,27 +794,27 @@
       if (sbuf && *sbuf) 
           apr_fprintf(f, "%s\n", sbuf); 
   
  -    if (ap_bgets(argsbuffer, HUGE_STRING_LEN, script_in) > 0) { 
  +    if (apr_fgets(argsbuffer, HUGE_STRING_LEN, script_in) == 0) { 
           apr_puts("%stdout\n", f); 
           apr_puts(argsbuffer, f); 
  -        while (ap_bgets(argsbuffer, HUGE_STRING_LEN, script_in) > 0) 
  +        while (apr_fgets(argsbuffer, HUGE_STRING_LEN, script_in) == 0) 
               apr_puts(argsbuffer, f); 
           apr_puts("\n", f); 
       } 
   
       if (script_err) {
  -        if (ap_bgets(argsbuffer, HUGE_STRING_LEN, script_err) > 0) { 
  +        if (apr_fgets(argsbuffer, HUGE_STRING_LEN, script_err) == 0) { 
               apr_puts("%stderr\n", f); 
               apr_puts(argsbuffer, f); 
  -            while (ap_bgets(argsbuffer, HUGE_STRING_LEN, script_err) > 0) 
  +            while (apr_fgets(argsbuffer, HUGE_STRING_LEN, script_err) == 0) 
                   apr_puts(argsbuffer, f); 
               apr_puts("\n", f); 
           } 
       }
   
  -    ap_bclose(script_in); 
  +    apr_close(script_in); 
       if (script_err) {
  -        ap_bclose(script_err); 
  +        apr_close(script_err); 
       }
   
       apr_close(f); 
  @@ -829,7 +831,8 @@
   { 
       int retval, nph, dbpos = 0; 
       char *argv0, *dbuf = NULL; 
  -    BUFF *script = NULL; 
  +    ap_bucket_brigade *bb;
  +    ap_bucket *b;
       char argsbuffer[HUGE_STRING_LEN]; 
       void *sconf = r->server->module_config; 
       cgid_server_conf *conf = (cgid_server_conf *) ap_get_module_config(sconf, &cgid_module);

  @@ -837,9 +840,8 @@
       int sd;
       char **env; 
       struct sockaddr_un unix_addr;
  -    apr_socket_t *tempsock = NULL;
  +    apr_file_t *tempsock = NULL;
       int nbytes;
  -    script = ap_bcreate(r->pool, B_RDWR); 
   
       if (r->method_number == M_OPTIONS) { 
           /* 99 out of 100 cgid scripts, this is all they support */ 
  @@ -916,9 +918,10 @@
   
       send_req(sd, r, argv0, env); 
   
  -    apr_put_os_sock(&tempsock, &sd, pcgi);
  -
  -    ap_bpush_socket(script, tempsock); 
  +    /* We are putting the tempsock variable into a file so that we can use
  +     * a pipe bucket to send the data to the client.
  +     */
  +    apr_put_os_file(&tempsock, &sd, pcgi);
   
       if ((retval = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR))) 
           return retval; 
  @@ -940,8 +943,6 @@
               dbpos = 0; 
           } 
   
  -
  -
           while ((len_read = 
                   ap_get_client_block(r, argsbuffer, HUGE_STRING_LEN)) > 0) { 
               if (conf->logname) { 
  @@ -954,7 +955,8 @@
                   memcpy(dbuf + dbpos, argsbuffer, dbsize); 
                   dbpos += dbsize; 
               } 
  -            ap_bwrite(script, argsbuffer, len_read, &nbytes);
  +            nbytes = len_read;
  +            apr_write(tempsock, argsbuffer, &nbytes);
               if (nbytes < len_read) { 
                   /* silly script stopped reading, soak up remaining message */ 
                   while (ap_get_client_block(r, argsbuffer, HUGE_STRING_LEN) > 0) { 
  @@ -963,19 +965,16 @@
                   break; 
               } 
           } 
  -
  -        ap_bflush(script); 
  -
       } 
   
       /* Handle script return... */ 
  -    if (script && !nph) { 
  +    if (!nph) { 
           const char *location; 
           char sbuf[MAX_STRING_LEN]; 
           int ret; 
   
  -        if ((ret = ap_scan_script_header_err_buff(r, script, sbuf))) { 
  -            return log_script(r, conf, ret, dbuf, sbuf, script, NULL); 
  +        if ((ret = ap_scan_script_header_err(r, tempsock, sbuf))) { 
  +            return log_script(r, conf, ret, dbuf, sbuf, tempsock, NULL); 
           } 
   
           location = apr_table_get(r->headers_out, "Location"); 
  @@ -983,7 +982,7 @@
           if (location && location[0] == '/' && r->status == 200) { 
   
               /* Soak up all the script output */ 
  -            while (ap_bgets(argsbuffer, HUGE_STRING_LEN, script) > 0) { 
  +            while (apr_fgets(argsbuffer, HUGE_STRING_LEN, tempsock) > 0) { 
                   continue; 
               } 
               /* This redirect needs to be a GET no matter what the original 
  @@ -1010,13 +1009,23 @@
   
           ap_send_http_header(r); 
           if (!r->header_only) { 
  -            ap_send_fb(script, r); 
  -        } 
  -        ap_bclose(script); 
  -    } 
  -
  -    if (script && nph) { 
  -        ap_send_fb(script, r); 
  +            bb = ap_brigade_create(r->pool);
  +            b = ap_bucket_create_pipe(tempsock);
  +            AP_BRIGADE_INSERT_TAIL(bb, b);
  +            b = ap_bucket_create_eos();
  +            AP_BRIGADE_INSERT_TAIL(bb, b);
  +            ap_pass_brigade(r->filters, bb);
  +        } 
  +        apr_close(tempsock); 
  +    } 
  +
  +    if (tempsock && nph) { 
  +        bb = ap_brigade_create(r->pool);
  +        b = ap_bucket_create_pipe(tempsock);
  +        AP_BRIGADE_INSERT_TAIL(bb, b);
  +        b = ap_bucket_create_eos();
  +        AP_BRIGADE_INSERT_TAIL(bb, b);
  +        ap_pass_brigade(r->filters, bb);
       } 
   
       return OK; /* NOT r->status, even if it has changed. */ 
  
  
  

Mime
View raw message