cvs commit: httpd-2.0/modules/proxy proxy_connect.c

[tr...@apache.org]

trawick     02/05/06 11:47:22

  Modified:    .        CHANGES
               modules/proxy proxy_connect.c
  Log:
  Get proxy CONNECT basically working (IE seems to be happy with secure
  connections).
  
  The to-do of fixing client I/O so it goes through the filters still
  remains.  But it will be nice if it will work until somebody gets
  around to doing that.
  
  Revision  Changes    Path
  1.762     +2 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.761
  retrieving revision 1.762
  diff -u -r1.761 -r1.762
  --- CHANGES	6 May 2002 18:30:18 -0000	1.761
  +++ CHANGES	6 May 2002 18:47:22 -0000	1.762
  @@ -1,5 +1,7 @@
   Changes with Apache 2.0.37
   
  +  *) Get proxy CONNECT basically working.  [Jeff Trawick]
  +
     *) Fix mod_rewrite hang when APR uses SysV Semaphores and
        RewriteLogLevel is set to anything other than 0.  PR: 8143
        [Aaron Bannert, Cliff Woolley]
  
  
  
  1.57      +1 -1      httpd-2.0/modules/proxy/proxy_connect.c
  
  Index: proxy_connect.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_connect.c,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- proxy_connect.c	13 Mar 2002 20:47:53 -0000	1.56
  +++ proxy_connect.c	6 May 2002 18:47:22 -0000	1.57
  @@ -279,11 +279,11 @@
           apr_send(client_socket, buffer, &nbytes);
           nbytes = apr_snprintf(buffer, sizeof(buffer),
   			      "Proxy-agent: %s" CRLF CRLF, ap_get_server_version());
  +        apr_send(client_socket, buffer, &nbytes);
   #if 0
           /* This is safer code, but it doesn't work yet.  I'm leaving it 
            * here so that I can fix it later.
            */
  -        apr_send(r->connection->client_socket, buffer, &nbytes);
           r->status = HTTP_OK;
           r->header_only = 1;
           apr_table_set(r->headers_out, "Proxy-agent: %s", ap_get_server_version());