httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ch...@apache.org
Subject cvs commit: httpd-proxy/module-2.0 CHANGES proxy_ftp.c proxy_http.c
Date Sat, 30 Jun 2001 04:50:33 GMT
chuck       01/06/29 21:50:32

  Modified:    module-2.0 CHANGES proxy_ftp.c proxy_http.c
  Log:
  Fix abort code path for HTTP proxy. Similar to Victor's patch for FTP
  proxy. No, Julia, it really *is* a double negative.
  
  Revision  Changes    Path
  1.6       +19 -2     httpd-proxy/module-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/CHANGES,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CHANGES	2001/06/29 00:12:08	1.5
  +++ CHANGES	2001/06/30 04:50:30	1.6
  @@ -1,7 +1,14 @@
   
  -mod_proxy changes for httpd 2.0.18-dev
  +mod_proxy changes for httpd 2.0.20-dev
   
  +  *) Fix abort code path in proxy_http.c, similar to FTP fix.
  +     [Chuck Murcko <chuck@topsail.org>]
  +
  +  *) Fix FTP ABOR command execution path.
  +     [Victor Orlikowski <v.j.orlikowski@gte.net>]
  +
     *) FTP return code variable cleanup; fixed problem in login
  +     [Chuck Murcko <chuck@topsail.org>]
   
     *) Get PORT working again in the ftp proxy.
        [Victor Orlikowski <v.j.orlikowski@gte.net>]
  @@ -20,6 +27,8 @@
        [Chuck Murcko <chuck@topsail.org>]
        [Victor Orlikowski <v.j.orlikowski@gte.net>]
   
  +mod_proxy changes for httpd 2.0.19
  +
     *) Reverse previous patch since the core reverted.
        [Chuck Murcko <chuck@topsail.org>]
   
  @@ -51,6 +60,8 @@
     *) Fix warnings about byte count type on Darwin (connect handler).
        [Chuck Murcko <chuck@topsail.org>]
   
  +mod_proxy changes for httpd 2.0.18
  +
     *) IPV6 EPSV support for IPV6 in FTP proxy.
        [Graham Leggett <minfrin@sharp.fm>]
   
  @@ -77,6 +88,8 @@
     *) Converted send_dir() to ap_proxy_send_dir_filter() in proxy_ftp.c.
        [Graham Leggett <minfrin@sharp.fm>]
   
  +mod_proxy changes for httpd 2.0.17
  +
     *) Major rework of ap_proxy_ftp_handler() to use filters (begone foul
        BUFF!!!). It compiles, but is untested, and the build environment needs
        to be fixed to include proxy_ftp.c.
  @@ -94,6 +107,8 @@
        would not trigger an IP address check with ProxyBlock.
        [Graham Leggett <minfrin@sharp.fm>]
   
  +mod_proxy changes for httpd 2.0.16
  +
     *) Fixed ProxyBlock bugs with ap_proxy_http_handler() and
        ap_proxy_connect_handler().
        [Graham Leggett <minfrin@sharp.fm>]
  @@ -110,6 +125,8 @@
        the directly following proxy keepalive request to fail.
        [Graham Leggett <minfrin@sharp.fm>]
   
  +mod_proxy changes for httpd 2.0.15
  +
     *) Added support for downstream keepalives in mod_proxy.
        [Graham Leggett <minfrin@sharp.fm>]
   
  @@ -142,7 +159,7 @@
        - Some cosmetic fixes and commenting.
        [Graham Leggett <minfrin@sharp.fm>]
   
  -mod_proxy changes for 2.0.14 alpha
  +mod_proxy changes for httpd 2.0.14
   
     *) removed ProxyNoCache and ProxyCacheForceCompletion config directives,
        since we no longer directly cache from this module
  
  
  
  1.71      +2 -2      httpd-proxy/module-2.0/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_ftp.c,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- proxy_ftp.c	2001/06/29 22:22:19	1.70
  +++ proxy_ftp.c	2001/06/30 04:50:30	1.71
  @@ -794,7 +794,7 @@
   	 *  after the time of the response.
   	 *     Retry-After  = "Retry-After" ":" ( HTTP-date | delta-seconds )
   	 */
  -	for (i=0 ; buffer[i] && !isdigit(buffer[i]); i++);
  +	for (i = 0; buffer[i] && !isdigit(buffer[i]); i++);
   	if (buffer[i]) {
   	    ap_table_add(r->headers_out, "Retry-After", apr_psprintf(p, "%lu", 60*atol(buffer+i)));
   	}
  @@ -1264,7 +1264,7 @@
       /* set request; "path" holds last path component */
       len = decodeenc(path);
   
  -    /* TM - if len == 0 then it must be a directory (you can't RETR anything) */
  +    /* TM - if len == 0 then it must be a directory (you can't RETR nothing) */
   
       if (len == 0) {
   	parms = "d";
  
  
  
  1.75      +7 -2      httpd-proxy/module-2.0/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-proxy/module-2.0/proxy_http.c,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- proxy_http.c	2001/06/06 21:51:57	1.74
  +++ proxy_http.c	2001/06/30 04:50:31	1.75
  @@ -788,8 +788,13 @@
   		ap_pass_brigade(r->output_filters, bb);
   		break;
   	    }
  -	    ap_pass_brigade(r->output_filters, bb);
  -	    apr_brigade_cleanup(bb);
  +            if (ap_pass_brigade(r->output_filters, bb) != APR_SUCCESS) {
  +                /* Ack! Phbtt! Die! User aborted! */
  +                apr_brigade_cleanup(bb);
  +                close = 1;  /* this causes socket close below */
  +                break;
  +            }
  +            apr_brigade_cleanup(bb);
   	}
   	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
   		     "proxy: end body send");
  
  
  

Mime
View raw message