httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apache/src/modules/proxy proxy_ftp.c
Date Tue, 20 Jan 1998 00:49:39 GMT
dgaudet     98/01/19 16:49:39

  Modified:    .        Tag: APACHE_1_2_X STATUS
               src      Tag: APACHE_1_2_X CHANGES
               src/modules/proxy Tag: APACHE_1_2_X proxy_ftp.c
  Log:
  mod_proxy was sending HTTP/1.1 responses to ftp requests by mistake.
  Also removed the auto-generated link to www.apache.org that was the
  source of so many misdirected bug reports.  (fixed in 1.3b1)
  
  Submitted by:	Roy Fielding, Marc Slemko
  Reviewed by:	Dean Gaudet
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.17  +1 -0      apache/Attic/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /export/home/cvs/apache/Attic/STATUS,v
  retrieving revision 1.1.2.16
  retrieving revision 1.1.2.17
  diff -u -r1.1.2.16 -r1.1.2.17
  --- STATUS	1998/01/20 00:35:15	1.1.2.16
  +++ STATUS	1998/01/20 00:49:34	1.1.2.17
  @@ -14,6 +14,7 @@
       * backport of the netscape header padding fix
       * general/1666: basic auth token should be tested case-insensitive
       * protocol/1683: The Connection header may contain multiple close tokens
  +    * proxy was sending HTTP/1.1 responses in error
   
   Available:
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.286.2.69 +4 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.286.2.68
  retrieving revision 1.286.2.69
  diff -u -r1.286.2.68 -r1.286.2.69
  --- CHANGES	1998/01/20 00:35:17	1.286.2.68
  +++ CHANGES	1998/01/20 00:49:36	1.286.2.69
  @@ -1,5 +1,9 @@
   Changes with Apache 1.2.6
   
  +  *) mod_proxy was sending HTTP/1.1 responses to ftp requests by mistake.
  +     Also removed the auto-generated link to www.apache.org that was the
  +     source of so many misdirected bug reports.  [Roy Fielding, Marc Slemko]
  +
     *) Multiple "close" tokens may have been set in the "Connection"
        header, not an error, but a waste.
        [Ronald.Tschalaer@psi.ch] PR#1683
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.21.2.3  +6 -5      apache/src/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.21.2.2
  retrieving revision 1.21.2.3
  diff -u -r1.21.2.2 -r1.21.2.3
  --- proxy_ftp.c	1998/01/05 21:05:07	1.21.2.2
  +++ proxy_ftp.c	1998/01/20 00:49:38	1.21.2.3
  @@ -372,9 +372,10 @@
               o+=w;
           }
       }
  -    ap_snprintf(buf, sizeof(buf), "</PRE><HR><I><A HREF=\"http://www.apache.org\">%s</A></I></BODY></HTML>",
SERVER_VERSION);
  -    bwrite(con->client, buf, strlen(buf));
  -    if (f2 != NULL) bwrite(f2, buf, strlen(buf));
  +    bputs("</PRE><HR></BODY></HTML>\015\012", con->client);
  +    if (f2 != NULL) {
  +	bputs("</PRE><HR></BODY></HTML>\015\012", f2);
  +    }
       total_bytes_sent+=strlen(buf);
       bflush(con->client);
       
  @@ -944,9 +945,9 @@
   /* send response */
   /* write status line */
       if (!r->assbackwards)
  -	rvputs(r, SERVER_PROTOCOL, " ", r->status_line, "\015\012", NULL);
  +	rvputs(r, "HTTP/1.0 ", r->status_line, "\015\012", NULL);
       if (cache != NULL)
  -	if (bvputs(cache, SERVER_PROTOCOL, " ", r->status_line, "\015\012",
  +	if (bvputs(cache, "HTTP/1.0 ", r->status_line, "\015\012",
   		   NULL) == -1)
   	    cache = proxy_cache_error(c);
   
  
  
  

Mime
View raw message