cvs commit: apachen/src/modules/proxy proxy_ftp.c

[Roy Fielding <fi...@hyperreal.org>]

fielding    97/09/30 14:02:16

  Modified:    src      CHANGES
               src/modules/proxy 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.
  
  Submitted by:	Roy Fielding, Marc Slemko
  
  Revision  Changes    Path
  1.452     +4 -0      apachen/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/CHANGES,v
  retrieving revision 1.451
  retrieving revision 1.452
  diff -u -r1.451 -r1.452
  --- CHANGES	1997/09/26 03:52:08	1.451
  +++ CHANGES	1997/09/30 21:02:10	1.452
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3b1
     
  +  *) 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]
  +
     *) Change to CGI permission test to allow User/Group tests to do the
        right thing for suexec. [Randy Terbush] PR#918
   
  
  
  
  1.40      +4 -5      apachen/src/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- proxy_ftp.c	1997/09/18 00:20:19	1.39
  +++ proxy_ftp.c	1997/09/30 21:02:14	1.40
  @@ -375,10 +375,9 @@
   	    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));
  +    bputs("</PRE><HR></BODY></HTML>\015\012", con->client);
       if (f2 != NULL)
  -	bwrite(f2, buf, strlen(buf));
  +	bputs("</PRE><HR></BODY></HTML>\015\012", f2);
       total_bytes_sent += strlen(buf);
       bflush(con->client);
   
  @@ -964,9 +963,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);