httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@locus.apache.org
Subject cvs commit: apache-1.3/src/modules/proxy proxy_connect.c
Date Sun, 12 Mar 2000 16:48:52 GMT
dgaudet     00/03/12 08:48:52

  Modified:    src      CHANGES
               src/modules/proxy proxy_connect.c
  Log:
  use send/recv instead of write/read in proxy_connect -- fixes
  https through proxy on NT.
  
  Submitted by:	willem.vanpelt@philips.com
  
  Revision  Changes    Path
  1.1524    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1523
  retrieving revision 1.1524
  diff -u -r1.1523 -r1.1524
  --- CHANGES	2000/03/02 21:23:36	1.1523
  +++ CHANGES	2000/03/12 16:48:50	1.1524
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.13
   
  +  *) use send/recv instead of write/read in proxy_connect -- fixes
  +     https through proxy on NT.  [willem.vanpelt@philips.com]
  +
     *) [EBCDIC] Make chunked encoding work again; it was broken by the
        recent CRLF macro changes. An oversight. [Martin Kraemer]
   
  
  
  
  1.40      +7 -7      apache-1.3/src/modules/proxy/proxy_connect.c
  
  Index: proxy_connect.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_connect.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- proxy_connect.c	1999/08/27 20:21:51	1.39
  +++ proxy_connect.c	2000/03/12 16:48:51	1.40
  @@ -226,10 +226,10 @@
   	Explain0("Sending the CONNECT request to the remote proxy");
   	ap_snprintf(buffer, sizeof(buffer), "CONNECT %s HTTP/1.0" CRLF,
   		    r->uri);
  -	write(sock, buffer, strlen(buffer));
  +	send(sock, buffer, strlen(buffer),0);
   	ap_snprintf(buffer, sizeof(buffer),
   		    "Proxy-agent: %s" CRLF CRLF, ap_get_server_version());
  -	write(sock, buffer, strlen(buffer));
  +	send(sock, buffer, strlen(buffer),0);
       }
       else {
   	Explain0("Returning 200 OK Status");
  @@ -252,10 +252,10 @@
   	if (i) {
   	    if (FD_ISSET(sock, &fds)) {
   		Explain0("sock was set");
  -		if ((nbytes = read(sock, buffer, HUGE_STRING_LEN)) != 0) {
  +		if ((nbytes = recv(sock, buffer, HUGE_STRING_LEN,0)) != 0) {
   		    if (nbytes == -1)
   			break;
  -		    if (write(ap_bfileno(r->connection->client, B_WR), buffer, nbytes) == EOF)
  +		    if (send(ap_bfileno(r->connection->client, B_WR), buffer, nbytes,0) == EOF)
   			break;
   		    Explain1("Wrote %d bytes to client", nbytes);
   		}
  @@ -264,11 +264,11 @@
   	    }
   	    else if (FD_ISSET(ap_bfileno(r->connection->client, B_WR), &fds)) {
   		Explain0("client->fd was set");
  -		if ((nbytes = read(ap_bfileno(r->connection->client, B_WR), buffer,
  -				   HUGE_STRING_LEN)) != 0) {
  +		if ((nbytes = recv(ap_bfileno(r->connection->client, B_WR), buffer,
  +				   HUGE_STRING_LEN, 0)) != 0) {
   		    if (nbytes == -1)
   			break;
  -		    if (write(sock, buffer, nbytes) == EOF)
  +		    if (send(sock, buffer, nbytes, 0) == EOF)
   			break;
   		    Explain1("Wrote %d bytes to server", nbytes);
   		}
  
  
  

Mime
View raw message