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/proxy proxy_connect.c
Date Sat, 11 Nov 2000 17:51:59 GMT
rbb         00/11/11 09:51:58

  Modified:    src/modules/proxy proxy_connect.c
  Log:
  Make proxy_connect.c compile cleanly again.  Not sure if it works or not,
  but it does compile.
  
  Revision  Changes    Path
  1.14      +5 -4      apache-2.0/src/modules/proxy/proxy_connect.c
  
  Index: proxy_connect.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/proxy/proxy_connect.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- proxy_connect.c	2000/11/11 11:04:45	1.13
  +++ proxy_connect.c	2000/11/11 17:51:58	1.14
  @@ -209,7 +209,7 @@
               "Returning 200 OK Status");
           ap_rvputs(r, "HTTP/1.0 200 Connection established" CRLF, NULL);
           ap_rvputs(r, "Proxy-agent: ", ap_get_server_version(), CRLF CRLF, NULL);
  -        ap_bflush(r->connection->client);
  +        ap_rflush(r);
       }
   
       sock_buff = ap_bcreate(r->pool, B_RDWR);
  @@ -262,7 +262,8 @@
                       int o = 0;
                       while(nbytes)
                       {
  -                        ap_bwrite(r->connection->client, buffer + o, nbytes, &i);
  +                        i = nbytes;
  +                        apr_send(r->connection->client_socket, buffer + o, &i);
                           o += i;
                           nbytes -= i;
                       }
  @@ -276,8 +277,8 @@
               if (pollevent & APR_POLLIN) {
                   ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, NULL,
                                "client was set");
  -                if(ap_bread(r->connection->client, buffer, HUGE_STRING_LEN,
  -                  &nbytes) == APR_SUCCESS) {
  +                nbytes = HUGE_STRING_LEN;
  +                if(apr_recv(r->connection->client_socket, buffer, &nbytes) ==
APR_SUCCESS) {
                       int o = 0;
                       while(nbytes)
                       {
  
  
  

Mime
View raw message